From 9db76b0b15ac879d6bf6de68fb94c8ebf6331bc8 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Wed, 27 Jul 2022 11:47:58 -0700 Subject: [PATCH] Fix #156477. Interactive Window Restore (#156480) * Fix #156477. Interactive Window Restore * Fix #156487. Update description --- .../contrib/interactive/browser/interactive.contribution.ts | 6 +++--- .../contrib/interactive/browser/interactiveCommon.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts b/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts index c6442b9ce9c..3db0fd13064 100644 --- a/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts +++ b/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts @@ -283,7 +283,7 @@ export class InteractiveEditorSerializer implements IEditorSerializer { } canSerialize(): boolean { - return this.configurationService.getValue(InteractiveWindowSetting.interactiveWindowHotExit); + return this.configurationService.getValue(InteractiveWindowSetting.interactiveWindowRestore); } serialize(input: EditorInput): string { @@ -763,10 +763,10 @@ Registry.as(ConfigurationExtensions.Configuration).regis default: true, markdownDescription: localize('interactiveWindow.alwaysScrollOnNewCell', "Automatically scroll the interactive window to show the output of the last statement executed. If this value is false, the window will only scroll if the last cell was already the one scrolled to.") }, - [InteractiveWindowSetting.interactiveWindowHotExit]: { + [InteractiveWindowSetting.interactiveWindowRestore]: { type: 'boolean', default: false, - markdownDescription: localize('interactiveWindow.hotExit', "Controls whether the interactive window sessions should be restored when the workspace reloads.") + markdownDescription: localize('interactiveWindow.restore', "Controls whether the Interactive Window sessions/history should be restored across window reloads. Whether the state of controllers used in Interactive Windows is persisted across window reloads are controlled by extensions contributing controllers.") } } }); diff --git a/src/vs/workbench/contrib/interactive/browser/interactiveCommon.ts b/src/vs/workbench/contrib/interactive/browser/interactiveCommon.ts index edda5c7f25f..c98f2e6a7e0 100644 --- a/src/vs/workbench/contrib/interactive/browser/interactiveCommon.ts +++ b/src/vs/workbench/contrib/interactive/browser/interactiveCommon.ts @@ -9,5 +9,5 @@ export const INTERACTIVE_INPUT_CURSOR_BOUNDARY = new RawContextKey<'none' | 'top export const InteractiveWindowSetting = { interactiveWindowAlwaysScrollOnNewCell: 'interactiveWindow.alwaysScrollOnNewCell', - interactiveWindowHotExit: 'interactiveWindow.hotExit' + interactiveWindowRestore: 'interactiveWindow.restore' };