From 4518769b4517d5661f85f7718bd9d2cbd2ad7289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sat, 14 Jul 2018 22:08:02 +0200
Subject: [PATCH] Displaying contents of local variables (AS3) while debugging

---
 CHANGELOG.md                                       |  1 +
 .../jpexs/decompiler/flash/gui/abc/ABCPanel.java   | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2175b0ce..6b2cdb2f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ All notable changes to this project will be documented in this file.
 - AS1/2 Delete operator with nonIdentifier parameters (e.g. spaces or obfuscated)
 - DefineBits (with JPEGTables) tag export
 - No disabling autoOpenLoadedSWFs checkbox when ActiveX player not available (User can use Run button)
+- Displaying contents of local variables (AS3) while debugging
 
 ## [11.1.0] - 2018-05-24
 ### Added
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 59905ab14..38fe72cbd 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -376,10 +376,10 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
             }
 
             //current var is getter function - set it to value really got
-            //if ((var.flags & VariableFlags.HAS_GETTER) > 0)
-            {
+            if ((var.flags & VariableFlags.HAS_GETTER) > 0) {
                 varInsideGetter = igv.parent;
             }
+
             Variable curTrait = null;
             for (int i = 0; i < igv.childs.size(); i++) {
                 if (!isTraits(igv.childs.get(i))) {
@@ -410,6 +410,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
 
         public VariableNode(List<VariableNode> parentPath, int level, Variable var, Long parentObjectId, Variable trait) {
             this.var = var;
+            this.varInsideGetter = var;
             this.parentObjectId = parentObjectId;
             this.level = level;
             this.trait = trait;
@@ -420,6 +421,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
 
         public VariableNode(List<VariableNode> parentPath, int level, Variable var, Long parentObjectId, Variable trait, List<VariableNode> subvars) {
             this.var = var;
+            this.varInsideGetter = var;
             this.parentObjectId = parentObjectId;
             this.level = level;
             this.trait = trait;
@@ -830,11 +832,11 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
             }
         }
 
-        public String TryGetDebugHoverToolTipText(String varName) {
+        public String tryGetDebugHoverToolTipText(String varName) {
             String lowerName = varName.toLowerCase();
             StringBuilder builder = new StringBuilder();
 
-            FindVarAndAppendDataToString(root, lowerName, builder);
+            findVarAndAppendDataToString(root, lowerName, builder);
             String text = builder.toString();
 
             if (text == null || text.isEmpty()) {
@@ -844,14 +846,14 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
             }
         }
 
-        private void FindVarAndAppendDataToString(VariableNode node, String lowerVarName, StringBuilder builder) {
+        private void findVarAndAppendDataToString(VariableNode node, String lowerVarName, StringBuilder builder) {
             if (node.var != null && node.var.name.toLowerCase().contains(lowerVarName)) {
                 builder.append(node.var.name + ": " + node.var.getValueAsStr() + "<br>");
             }
 
             if (node.childs != null) {
                 for (int i = 0; i < node.childs.size(); i++) {
-                    FindVarAndAppendDataToString(node.childs.get(i), lowerVarName, builder);
+                    findVarAndAppendDataToString(node.childs.get(i), lowerVarName, builder);
                 }
             }
         }