Fix variable explorer when restarting a kernel (#9931)

* Make sure to clear variable list on reset * Add news entry
microsoft · Feb 6, 2020 · 7c2bfe6 · 7c2bfe6
1 parent 9f5ac3f
commit 7c2bfe6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/news/2 Fixes/9740.md b/news/2 Fixes/9740.md
@@ -0,0 +1 @@
+Make sure to clear variable list on restart kernel.
diff --git a/src/datascience-ui/interactive-common/redux/reducers/variables.ts b/src/datascience-ui/interactive-common/redux/reducers/variables.ts
@@ -22,7 +22,7 @@ type VariableReducerFunc<T> = ReducerFunc<IVariableState, IncomingMessageActions
 type VariableReducerArg<T = never | undefined> = ReducerArg<IVariableState, IncomingMessageActions, T>;
 
 function handleRequest(arg: VariableReducerArg<IJupyterVariablesRequest>): IVariableState {
-    const newExecutionCount = arg.payload.executionCount ? arg.payload.executionCount : arg.prevState.currentExecutionCount;
+    const newExecutionCount = arg.payload.executionCount !== undefined ? arg.payload.executionCount : arg.prevState.currentExecutionCount;
     arg.queueAction(
         createPostableAction(InteractiveWindowMessages.GetVariablesRequest, {
             executionCount: newExecutionCount,
@@ -108,7 +108,12 @@ function handleResponse(arg: VariableReducerArg<IJupyterVariablesResponse>): IVa
 function handleRestarted(arg: VariableReducerArg): IVariableState {
     // If the variables are visible, refresh them
     if (arg.prevState.visible) {
-        return handleRequest({ ...arg, payload: { executionCount: 0, sortColumn: 'name', sortAscending: true, startIndex: 0, pageSize: arg.prevState.pageSize } });
+        const result = handleRequest({ ...arg, payload: { executionCount: 0, sortColumn: 'name', sortAscending: true, startIndex: 0, pageSize: arg.prevState.pageSize } });
+        return {
+            ...result,
+            currentExecutionCount: 0,
+            variables: []
+        };
     }
     return arg.prevState;
 }