bug fix

main.py

@@ -51,12 +51,14 @@ def getVars(self):
             if symbol.is_variable:
                 dic[symbol.name] = symbol.value(frame).format_string()
 
-        for symbol in block:
-            if symbol.is_variable:
-                dic[symbol.name] = symbol.value(frame).format_string()
+        while block:
+            for symbol in block:
+                if symbol.is_variable:
+                    dic[symbol.name] = symbol.value(frame).format_string()
 
-            if symbol.is_argument and symbol.name not in dic:
-                dic[symbol.name] = symbol.value(frame).format_string()
+                if symbol.is_argument and symbol.name not in dic:
+                    dic[symbol.name] = symbol.value(frame).format_string()
+            block = block.superblock
 
         return dic if len(dic) > 0 else None
 
@@ -122,8 +124,13 @@ def saveAssiggnmentHistory(self, line: int, oldlocals: dict, oldLineStr: str, st
         # if no changes detected, attempt to find a var in the line and then save it
         assignmentRegX = r"([^\"\'])(\s*)([a-zA-Z_][a-zA-Z0-9_]*)(\s*)(\+\=|\-\=|\*\=|\/\=|\%\=|\=)(\s*)([a-zA-Z0-9_]+|\-?[0-9]+(\.[0-9]+)?)"
         match = re.search(assignmentRegX, oldLineStr)
-        if match and match.group(3).strip in newLocals:
+        print('match', oldLineStr, )
+        if match:
             res = match.group(3).strip()
+            if newLocals.get(res) is None:
+                print("var " + match.group(3).strip() + " not in locals", )
+                return
+
             obj = {"line": line, "value": oldlocals[res], "var": res,
                    "file": file, "stackHeight": stackHeight, "step": currentStep}
             print("appended obj no change", obj)

src/extension.ts

@@ -22,7 +22,7 @@ export function activate(context: vscode.ExtensionContext) {
         setHTMLcontent(panel, htmlContent[currentFile].join(""), scriptPath, cssPath);
 
 
-        // TODO: test
+
         vscode.window.onDidChangeTextEditorSelection(() => {
             const currentFile = path.parse(utils.getActiveDocument()).base;
             if (!currentFile) { return; }

src/html_builder.ts

@@ -52,8 +52,7 @@ function getHTMLperLine(lineHistory: interfaces.LineMapping): string[] {
 
 
 function getHTMLperArgsHistory(argsHistory: interfaces.ArgsHistory): string {
-    // TODO: implement
-    return `<div class="entry column-width editor-height" id="name-${argsHistory.functionName}"> TODO</div>`;
+    return `<div class="entry column-width editor-height" id="name-${argsHistory.functionName}"> arg</div>`;
 }
 
 function getHTMLperLineHistory(lineHistory: interfaces.LineHistory): string {

src/webview/webview_script.js

@@ -204,7 +204,7 @@ function getMaxEntryWidth(line, font) {
             maxWidth = width;
         }
     }
-    return Math.ceil(maxWidth) + 4; // TODO remove base
+    return Math.ceil(maxWidth) + 4;
 }
 
 function initWidths() {