From 019359c7b60d5655fa3706cb1e2ac4e19192fae7 Mon Sep 17 00:00:00 2001 From: Aaron Munger Date: Fri, 4 Oct 2024 11:05:12 -0700 Subject: [PATCH] remove "experimental" from setting id (#230523) --- .../browser/contrib/notebookVariables/notebookVariables.ts | 6 +++++- src/vs/workbench/contrib/notebook/common/notebookCommon.ts | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.ts b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.ts index d1816c4d2a5..c539064c8e5 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.ts @@ -56,7 +56,11 @@ export class NotebookVariables extends Disposable implements IWorkbenchContribut } private handleInitEvent(notebook?: URI) { - const enabled = this.editorService.activeEditorPane?.getId() === 'workbench.editor.repl' || this.configurationService.getValue(NotebookSetting.notebookVariablesView); + const enabled = + this.editorService.activeEditorPane?.getId() === 'workbench.editor.repl' || + this.configurationService.getValue(NotebookSetting.notebookVariablesView) || + // old setting key + this.configurationService.getValue('notebook.experimental.variablesView'); if (enabled && (!!notebook || this.editorService.activeEditorPane?.getId() === 'workbench.editor.notebook')) { if (this.hasVariableProvider(notebook) && !this.initialized && this.initializeView()) { this.viewEnabled.set(true); diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts index 4d8506b9adf..1edc95944ae 100644 --- a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts +++ b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts @@ -1018,7 +1018,7 @@ export const NotebookSetting = { scrollToRevealCell: 'notebook.scrolling.revealNextCellOnExecute', cellChat: 'notebook.experimental.cellChat', cellGenerate: 'notebook.experimental.generate', - notebookVariablesView: 'notebook.experimental.variablesView', + notebookVariablesView: 'notebook.variablesView', InteractiveWindowPromptToSave: 'interactiveWindow.promptToSaveOnClose', cellFailureDiagnostics: 'notebook.cellFailureDiagnostics', outputBackupSizeLimit: 'notebook.backup.sizeLimit',