Show locals in variable explorer

microsoft · Apr 25, 2021 · 86a198e · 86a198e
1 parent 70073c0
commit 86a198e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/client/datascience/debugLocationTracker.ts b/src/client/datascience/debugLocationTracker.ts
@@ -110,7 +110,7 @@ export class DebugLocationTracker implements DebugAdapterTracker {
         return false;
     }
 
-    private isContinueEvent(message: DebugProtocol.ProtocolMessage): boolean {
+    protected isContinueEvent(message: DebugProtocol.ProtocolMessage): boolean {
         if (message.type === 'event') {
             const eventMessage = message as DebugProtocol.Event;
             if (eventMessage.event === 'continue') {

diff --git a/src/client/datascience/jupyter/debuggerVariables.ts b/src/client/datascience/jupyter/debuggerVariables.ts
@@ -204,6 +204,8 @@ export class DebuggerVariables extends DebugLocationTracker
             // TODO: Figure out what resource to use
             this.updateVariables(undefined, message as DebugProtocol.VariablesResponse);
             this.monkeyPatchDataViewableVariables(message);
+        } else if (this.isContinueEvent(message)) {
+            this.lastKnownVariables = [];
         } else if (message.type === 'event' && message.event === 'terminated') {
             // When the debugger exits, make sure the variables are cleared
             this.lastKnownVariables = [];
@@ -342,10 +344,14 @@ export class DebuggerVariables extends DebugLocationTracker
             }
             return true;
         });
-
-        this.lastKnownVariables = allowedVariables.map((v) => {
+        // There will be multiple variable requests sent from the client,
+        // one per scope. Combine the variables from the new response with
+        // the existing this.lastKnownVariables, and only clear
+        // this.lastKnownVariables when the user steps. TODO: how to display
+        // shadowed names?
+        this.lastKnownVariables = this.lastKnownVariables.concat(allowedVariables.map((v) => {
             return convertDebugProtocolVariableToIJupyterVariable(v);
-        });
+        }));
 
         this.refreshEventEmitter.fire();
     }