@codingame/monaco-vscode-notebook-service-override 9.0.2 → 10.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.js

@@ -1,5 +1,4 @@
 import { timeout } from 'vscode/vscode/vs/base/common/async';
-import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { localize } from 'vscode/vscode/vs/nls';
@@ -7,15 +6,14 @@ import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vscode/vscode/vs/platform/ac
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { InputFocusedContextKey, IsWindowsContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
 import { NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, findTargetCellEditor, NotebookAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_EDITOR_FOCUSED, IS_COMPOSITE_NOTEBOOK, NOTEBOOK_CELL_HAS_OUTPUTS } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
 const NOTEBOOK_FOCUS_TOP = 'notebook.focusTop';
 const NOTEBOOK_FOCUS_BOTTOM = 'notebook.focusBottom';
@@ -33,17 +31,17 @@ registerAction2(class extends Action2 {
         super({
             id: 'notebook.cell.nullAction',
             title: ( localize(
-                7985,
+                8045,
                 "Keypresses that should be handled by the focused element in the cell output."
             )),
             keybinding: [{
                     when: NOTEBOOK_OUTPUT_INPUT_FOCUSED,
-                    primary: KeyCode.DownArrow,
-                    weight: KeybindingWeight.WorkbenchContrib + 1
+                    primary: 18 ,
+                    weight: 200  + 1
                 }, {
                     when: NOTEBOOK_OUTPUT_INPUT_FOCUSED,
-                    primary: KeyCode.UpArrow,
-                    weight: KeybindingWeight.WorkbenchContrib + 1
+                    primary: 16 ,
+                    weight: 200  + 1
                 }],
             f1: false
         });
@@ -56,7 +54,7 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_NEXT_EDITOR,
-            title: ( localize(7986, 'Focus Next Cell Editor')),
+            title: ( localize(8046, 'Focus Next Cell Editor')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -71,7 +69,7 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
                         )),
                          (EditorContextKeys.isEmbeddedDiffEditor.negate())
                     ))),
-                    primary: KeyCode.DownArrow,
+                    primary: 18 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT,
                 },
                 {
@@ -86,20 +84,20 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
                         )),
                          (EditorContextKeys.isEmbeddedDiffEditor.negate())
                     ))),
-                    primary: KeyCode.DownArrow,
-                    weight: KeybindingWeight.WorkbenchContrib,
+                    primary: 18 ,
+                    weight: 200 ,
                 },
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
-                    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
-                    mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.DownArrow, },
-                    weight: KeybindingWeight.WorkbenchContrib
+                    primary: 2048  | 18 ,
+                    mac: { primary: 256  | 2048  | 18 , },
+                    weight: 200
                 },
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_EDITOR_FOCUSED, CONTEXT_ACCESSIBILITY_MODE_ENABLED))),
-                    primary: KeyMod.CtrlCmd | KeyCode.PageDown,
-                    mac: { primary: KeyMod.WinCtrl | KeyCode.PageUp, },
-                    weight: KeybindingWeight.WorkbenchContrib + 1
+                    primary: 2048  | 12 ,
+                    mac: { primary: 256  | 11 , },
+                    weight: 200  + 1
                 },
             ]
         });
@@ -131,7 +129,7 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_PREVIOUS_EDITOR,
-            title: ( localize(7987, 'Focus Previous Cell Editor')),
+            title: ( localize(8047, 'Focus Previous Cell Editor')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -146,7 +144,7 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
                         )),
                          (EditorContextKeys.isEmbeddedDiffEditor.negate())
                     ))),
-                    primary: KeyCode.UpArrow,
+                    primary: 16 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT,
                 },
                 {
@@ -161,14 +159,14 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
                         )),
                          (EditorContextKeys.isEmbeddedDiffEditor.negate())
                     ))),
-                    primary: KeyCode.UpArrow,
-                    weight: KeybindingWeight.WorkbenchContrib,
+                    primary: 16 ,
+                    weight: 200 ,
                 },
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_EDITOR_FOCUSED, CONTEXT_ACCESSIBILITY_MODE_ENABLED))),
-                    primary: KeyMod.CtrlCmd | KeyCode.PageUp,
-                    mac: { primary: KeyMod.WinCtrl | KeyCode.PageUp, },
-                    weight: KeybindingWeight.WorkbenchContrib + 1
+                    primary: 2048  | 11 ,
+                    mac: { primary: 256  | 11 , },
+                    weight: 200  + 1
                 },
             ],
         });
@@ -197,12 +195,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_TOP,
-            title: ( localize(7988, 'Focus First Cell')),
+            title: ( localize(8048, 'Focus First Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                    primary: KeyMod.CtrlCmd | KeyCode.Home,
-                    weight: KeybindingWeight.WorkbenchContrib
+                    primary: 2048  | 14 ,
+                    weight: 200
                 },
                 {
                     when: ( (ContextKeyExpr.and(
@@ -210,8 +208,8 @@ registerAction2(class extends NotebookAction {
                         ContextKeyExpr.not(InputFocusedContextKey),
                          (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
                     ))),
-                    mac: { primary: KeyMod.CtrlCmd | KeyCode.UpArrow },
-                    weight: KeybindingWeight.WorkbenchContrib
+                    mac: { primary: 2048  | 16  },
+                    weight: 200
                 }
             ],
         });
@@ -229,13 +227,13 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_BOTTOM,
-            title: ( localize(7989, 'Focus Last Cell')),
+            title: ( localize(8049, 'Focus Last Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                    primary: KeyMod.CtrlCmd | KeyCode.End,
+                    primary: 2048  | 13 ,
                     mac: undefined,
-                    weight: KeybindingWeight.WorkbenchContrib
+                    weight: 200
                 },
                 {
                     when: ( (ContextKeyExpr.and(
@@ -243,8 +241,8 @@ registerAction2(class extends NotebookAction {
                         ContextKeyExpr.not(InputFocusedContextKey),
                          (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
                     ))),
-                    mac: { primary: KeyMod.CtrlCmd | KeyCode.DownArrow },
-                    weight: KeybindingWeight.WorkbenchContrib
+                    mac: { primary: 2048  | 18  },
+                    weight: 200
                 }
             ],
         });
@@ -266,13 +264,18 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_IN_OUTPUT_COMMAND_ID,
-            title: ( localize(7990, 'Focus In Active Cell Output')),
-            keybinding: {
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS))),
-                primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
-                mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.DownArrow, },
-                weight: KeybindingWeight.WorkbenchContrib
-            },
+            title: ( localize(8050, 'Focus In Active Cell Output')),
+            keybinding: [{
+                    primary: 2048  | 1024  | 18 ,
+                    mac: { primary: 256  | 2048  | 18 , },
+                    weight: 200
+                },
+                {
+                    when: ( (ContextKeyExpr.and( (IS_COMPOSITE_NOTEBOOK.negate()), IsWindowsContext))),
+                    primary: 2048  | 18 ,
+                    weight: 200
+                }],
+            precondition: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS)))
         });
     }
     async runWithContext(accessor, context) {
@@ -285,13 +288,13 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_OUT_OUTPUT_COMMAND_ID,
-            title: ( localize(7991, 'Focus Out Active Cell Output')),
+            title: ( localize(8051, 'Focus Out Active Cell Output')),
             keybinding: {
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
-                primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
-                mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.UpArrow, },
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 2048  | 1024  | 16 ,
+                mac: { primary: 256  | 2048  | 16 , },
+                weight: 200
             },
+            precondition: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
         });
     }
     async runWithContext(accessor, context) {
@@ -304,14 +307,14 @@ registerAction2(class CenterActiveCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: CENTER_ACTIVE_CELL,
-            title: ( localize(7992, "Center Active Cell")),
+            title: ( localize(8052, "Center Active Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
-                primary: KeyMod.CtrlCmd | KeyCode.KeyL,
+                primary: 2048  | 42 ,
                 mac: {
-                    primary: KeyMod.WinCtrl | KeyCode.KeyL,
+                    primary: 256  | 42 ,
                 },
-                weight: KeybindingWeight.WorkbenchContrib
+                weight: 200
             },
         });
     }
@@ -323,7 +326,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_COMMAND_ID,
-            title: ( localize(7993, "Cell Cursor Page Up")),
+            title: ( localize(8053, "Cell Cursor Page Up")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -331,7 +334,7 @@ registerAction2(class extends NotebookCellAction {
                          (ContextKeyExpr.has(InputFocusedContextKey)),
                         EditorContextKeys.editorTextFocus
                     ))),
-                    primary: KeyCode.PageUp,
+                    primary: 11 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
             ]
@@ -345,7 +348,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_SELECT_COMMAND_ID,
-            title: ( localize(7994, "Cell Cursor Page Up Select")),
+            title: ( localize(8054, "Cell Cursor Page Up Select")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -354,7 +357,7 @@ registerAction2(class extends NotebookCellAction {
                         EditorContextKeys.editorTextFocus,
                          (NOTEBOOK_OUTPUT_FOCUSED.negate())
                     ))),
-                    primary: KeyMod.Shift | KeyCode.PageUp,
+                    primary: 1024  | 11 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
             ]
@@ -368,7 +371,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_COMMAND_ID,
-            title: ( localize(7995, "Cell Cursor Page Down")),
+            title: ( localize(8055, "Cell Cursor Page Down")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -376,7 +379,7 @@ registerAction2(class extends NotebookCellAction {
                          (ContextKeyExpr.has(InputFocusedContextKey)),
                         EditorContextKeys.editorTextFocus
                     ))),
-                    primary: KeyCode.PageDown,
+                    primary: 12 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
             ]
@@ -390,7 +393,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_SELECT_COMMAND_ID,
-            title: ( localize(7996, "Cell Cursor Page Down Select")),
+            title: ( localize(8056, "Cell Cursor Page Down Select")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -399,7 +402,7 @@ registerAction2(class extends NotebookCellAction {
                         EditorContextKeys.editorTextFocus,
                          (NOTEBOOK_OUTPUT_FOCUSED.negate())
                     ))),
-                    primary: KeyMod.Shift | KeyCode.PageDown,
+                    primary: 1024  | 12 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
             ]
@@ -424,7 +427,7 @@ function getPageSize(context) {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                7997,
+                8057,
                 "When enabled cursor can navigate to the next/previous cell when the current cursor in the cell editor is at the first/last line."
             ))
         }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.js

@@ -66,9 +66,9 @@ let NotebookVariables = class NotebookVariables extends Disposable {
         if (debugViewContainer) {
             const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
             const viewDescriptor = {
-                id: 'NOTEBOOK_VARIABLES', name: ( localize2(8069, "Notebook Variables")),
+                id: 'NOTEBOOK_VARIABLES', name: ( localize2(8133, "Notebook Variables")),
                 containerIcon: variablesViewIcon, ctorDescriptor: ( (new SyncDescriptor(NotebookVariablesView))),
-                order: 50, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: true, when: NOTEBOOK_VARIABLE_VIEW_ENABLED,
+                order: 50, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: false, when: NOTEBOOK_VARIABLE_VIEW_ENABLED,
             };
             viewsRegistry.registerViews([viewDescriptor], debugViewContainer);
             return true;

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource.js

@@ -74,7 +74,7 @@ class NotebookVariableDataSource {
                     notebook: parent.notebook,
                     id: parent.id + `${last + 1}`,
                     extHostId: parent.extHostId,
-                    name: ( localize(11477, "Display limit reached")),
+                    name: ( localize(11620, "Display limit reached")),
                     value: '',
                     indexedChildrenCount: 0,
                     hasNamedChildren: false

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.js

@@ -2,9 +2,9 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { $ as $$1, append } from 'vscode/vscode/vs/base/browser/dom';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize } from 'vscode/vscode/vs/nls';
-import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import 'vscode/vscode/vs/platform/list/browser/listService';
-import { renderExpressionValue } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
+import { DebugExpressionRenderer } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer';
 
 var NotebookVariableRenderer_1;
 const $ = $$1;
@@ -23,8 +23,8 @@ let NotebookVariableRenderer = class NotebookVariableRenderer {
     get templateId() {
         return NotebookVariableRenderer_1.ID;
     }
-    constructor(_hoverService) {
-        this._hoverService = _hoverService;
+    constructor(instantiationService) {
+        this.expressionRenderer = instantiationService.createInstance(DebugExpressionRenderer);
     }
     renderTemplate(container) {
         const expression = append(container, $('.expression'));
@@ -37,10 +37,11 @@ let NotebookVariableRenderer = class NotebookVariableRenderer {
         const text = element.element.value.trim() !== '' ? `${element.element.name}:` : element.element.name;
         data.name.textContent = text;
         data.name.title = element.element.type ?? '';
-        renderExpressionValue(data.elementDisposables, element.element, data.value, {
+        data.elementDisposables.add(this.expressionRenderer.renderValue(data.value, element.element, {
             colorize: true,
             maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-        }, this._hoverService);
+            session: undefined,
+        }));
     }
     disposeElement(element, index, templateData, height) {
         templateData.elementDisposables.clear();
@@ -50,14 +51,14 @@ let NotebookVariableRenderer = class NotebookVariableRenderer {
     }
 };
 NotebookVariableRenderer = NotebookVariableRenderer_1 = ( (__decorate([
-    ( (__param(0, IHoverService)))
+    ( (__param(0, IInstantiationService)))
 ], NotebookVariableRenderer)));
 class NotebookVariableAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(11478, "Notebook Variables"));
+        return ( localize(11621, "Notebook Variables"));
     }
     getAriaLabel(element) {
-        return ( localize(11479, "Variable {0}, value {1}", element.name, element.value));
+        return ( localize(11622, "Variable {0}, value {1}", element.name, element.value));
     }
 }
 

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.js

@@ -25,10 +25,14 @@ import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/cont
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { isCompositeNotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 
+var NotebookVariablesView_1;
 let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
+    static { NotebookVariablesView_1 = this; }
     static { this.ID = 'notebookVariablesView'; }
-    static { this.TITLE = ( localize2(10783, "Notebook Variables")); }
+    static { this.NOTEBOOK_TITLE = ( localize2(10871, "Notebook Variables")); }
+    static { this.REPL_TITLE = ( localize2(10872, "REPL Variables")); }
     constructor(options, editorService, notebookKernelService, notebookExecutionStateService, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, themeService, telemetryService, hoverService, menuService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.editorService = editorService;
@@ -40,14 +44,14 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         this._register(this.editorService.onDidActiveEditorChange(this.handleActiveEditorChange.bind(this)));
         this._register(this.notebookKernelService.onDidNotebookVariablesUpdate(this.handleVariablesChanged.bind(this)));
         this._register(this.notebookExecutionStateService.onDidChangeExecution(this.handleExecutionStateChange.bind(this)));
-        this.setActiveNotebook();
+        this.activeNotebook = this.getActiveNotebook()?.notebookDocument;
         this.dataSource = ( (new NotebookVariableDataSource(this.notebookKernelService)));
         this.updateScheduler = ( (new RunOnceScheduler(() => this.tree?.updateChildren(), 100)));
     }
     renderBody(container) {
         super.renderBody(container);
         this.element.classList.add('debug-pane');
-        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'notebookVariablesTree', container, ( (new NotebookVariablesDelegate())), [( (new NotebookVariableRenderer(this.hoverService)))], this.dataSource, {
+        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'notebookVariablesTree', container, ( (new NotebookVariablesDelegate())), [this.instantiationService.createInstance(NotebookVariableRenderer)], this.dataSource, {
             accessibilityProvider: ( (new NotebookVariableAccessibilityProvider())),
             identityProvider: { getId: (e) => e.id },
         });
@@ -91,42 +95,62 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         super.layoutBody(height, width);
         this.tree?.layout(height, width);
     }
-    setActiveNotebook() {
-        const current = this.activeNotebook;
-        const activeEditorPane = this.editorService.activeEditorPane;
-        if (activeEditorPane?.getId() === 'workbench.editor.notebook' || activeEditorPane?.getId() === 'workbench.editor.interactive') {
-            const notebookDocument = getNotebookEditorFromEditorPane(activeEditorPane)?.getViewModel()?.notebookDocument;
-            this.activeNotebook = notebookDocument;
+    setActiveNotebook(notebookDocument, editor) {
+        this.activeNotebook = notebookDocument;
+        this.tree?.setInput({ kind: 'root', notebook: notebookDocument });
+        this.updateScheduler.schedule();
+        if (isCompositeNotebookEditorInput(editor.input)) {
+            this.updateTitle(NotebookVariablesView_1.REPL_TITLE.value);
         }
-        return current !== this.activeNotebook;
+        else {
+            this.updateTitle(NotebookVariablesView_1.NOTEBOOK_TITLE.value);
+        }
+    }
+    getActiveNotebook() {
+        const notebookEditor = this.editorService.activeEditorPane;
+        const notebookDocument = getNotebookEditorFromEditorPane(notebookEditor)?.textModel;
+        return notebookDocument && notebookEditor ? { notebookDocument, notebookEditor } : undefined;
     }
     handleActiveEditorChange() {
-        if (this.setActiveNotebook() && this.activeNotebook) {
-            this.tree?.setInput({ kind: 'root', notebook: this.activeNotebook });
-            this.updateScheduler.schedule();
+        const found = this.getActiveNotebook();
+        if (found && found.notebookDocument !== this.activeNotebook) {
+            this.setActiveNotebook(found.notebookDocument, found.notebookEditor);
         }
     }
     handleExecutionStateChange(event) {
-        if (this.activeNotebook) {
-            if (event.affectsNotebook(this.activeNotebook.uri)) {
-                this.dataSource.cancel();
-                if (event.changed === undefined) {
-                    this.updateScheduler.schedule();
-                }
-                else {
-                    this.updateScheduler.cancel();
-                }
+        if (this.activeNotebook && event.affectsNotebook(this.activeNotebook.uri)) {
+            this.dataSource.cancel();
+            if (event.changed === undefined) {
+                this.updateScheduler.schedule();
             }
+            else {
+                this.updateScheduler.cancel();
+            }
+        }
+        else if (!this.getActiveNotebook()) {
+            this.editorService.visibleEditorPanes.forEach(editor => {
+                const notebookDocument = getNotebookEditorFromEditorPane(editor)?.textModel;
+                if (notebookDocument && event.affectsNotebook(notebookDocument.uri)) {
+                    this.setActiveNotebook(notebookDocument, editor);
+                }
+            });
         }
     }
     handleVariablesChanged(notebookUri) {
         if (this.activeNotebook && ( (notebookUri.toString())) === ( (this.activeNotebook.uri.toString()))) {
-            this.tree?.setInput({ kind: 'root', notebook: this.activeNotebook });
             this.updateScheduler.schedule();
         }
+        else if (!this.getActiveNotebook()) {
+            this.editorService.visibleEditorPanes.forEach(editor => {
+                const notebookDocument = getNotebookEditorFromEditorPane(editor)?.textModel;
+                if (notebookDocument && ( (notebookDocument.uri.toString())) === ( (notebookUri.toString()))) {
+                    this.setActiveNotebook(notebookDocument, editor);
+                }
+            });
+        }
     }
 };
-NotebookVariablesView = ( (__decorate([
+NotebookVariablesView = NotebookVariablesView_1 = ( (__decorate([
     ( (__param(1, IEditorService))),
     ( (__param(2, INotebookKernelService))),
     ( (__param(3, INotebookExecutionStateService))),