Skip to content

Commit 7d1b49a

Browse files
authored
Fix variable explorer when restarting a kernel (#9931)
* Make sure to clear variable list on reset * Add news entry
1 parent 4458703 commit 7d1b49a

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

news/2 Fixes/9740.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Make sure to clear variable list on restart kernel.

src/datascience-ui/interactive-common/redux/reducers/variables.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type VariableReducerFunc<T> = ReducerFunc<IVariableState, IncomingMessageActions
2222
type VariableReducerArg<T = never | undefined> = ReducerArg<IVariableState, IncomingMessageActions, T>;
2323

2424
function handleRequest(arg: VariableReducerArg<IJupyterVariablesRequest>): IVariableState {
25-
const newExecutionCount = arg.payload.executionCount ? arg.payload.executionCount : arg.prevState.currentExecutionCount;
25+
const newExecutionCount = arg.payload.executionCount !== undefined ? arg.payload.executionCount : arg.prevState.currentExecutionCount;
2626
arg.queueAction(
2727
createPostableAction(InteractiveWindowMessages.GetVariablesRequest, {
2828
executionCount: newExecutionCount,
@@ -108,7 +108,12 @@ function handleResponse(arg: VariableReducerArg<IJupyterVariablesResponse>): IVa
108108
function handleRestarted(arg: VariableReducerArg): IVariableState {
109109
// If the variables are visible, refresh them
110110
if (arg.prevState.visible) {
111-
return handleRequest({ ...arg, payload: { executionCount: 0, sortColumn: 'name', sortAscending: true, startIndex: 0, pageSize: arg.prevState.pageSize } });
111+
const result = handleRequest({ ...arg, payload: { executionCount: 0, sortColumn: 'name', sortAscending: true, startIndex: 0, pageSize: arg.prevState.pageSize } });
112+
return {
113+
...result,
114+
currentExecutionCount: 0,
115+
variables: []
116+
};
112117
}
113118
return arg.prevState;
114119
}

0 commit comments

Comments
 (0)