@codingame/monaco-vscode-notebook-service-override 10.1.4 → 11.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.js

@@ -13,7 +13,7 @@ import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/acti
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
-import { NOTEBOOK_ACTIONS_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { NOTEBOOK_ACTIONS_CATEGORY } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -29,7 +29,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.format',
-            title: ( localize2(8285, 'Format Notebook')),
+            title: ( localize2(8083, 'Format Notebook')),
             category: NOTEBOOK_ACTIONS_CATEGORY,
             precondition: ( (ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE))),
             keybinding: {
@@ -80,7 +80,7 @@ registerAction2(class extends Action2 {
                     }
                     return [];
                 }))));
-                await bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8286, "Format Notebook")), code: 'undoredo.formatNotebook', });
+                await bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8084, "Format Notebook")), code: 'undoredo.formatNotebook', });
             }
         }
         finally {
@@ -92,7 +92,7 @@ registerEditorAction(class FormatCellAction extends EditorAction {
     constructor() {
         super({
             id: 'notebook.formatCell',
-            label: ( localize(8287, "Format Cell")),
+            label: ( localize(8085, "Format Cell")),
             alias: 'Format Cell',
             precondition: ( (ContextKeyExpr.and(
                 NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -164,7 +164,7 @@ let FormatOnCellExecutionParticipant = class FormatOnCellExecutionParticipant {
                 }
                 return [];
             }))));
-            await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8288, "Format Cells")), code: 'undoredo.notebooks.onWillExecuteFormat', });
+            await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8086, "Format Cells")), code: 'undoredo.notebooks.onWillExecuteFormat', });
         }
         finally {
             disposable.dispose();

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted.js

@@ -63,7 +63,7 @@ registerAction2(class NotebookClearNotebookLayoutAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.notebook.layout.gettingStarted',
-            title: ( localize2(8300, "Reset notebook getting started")),
+            title: ( localize2(8097, "Reset notebook getting started")),
             f1: true,
             precondition: ( (ContextKeyExpr.equals(`config.${NotebookSetting.openGettingStarted}`, true))),
             category: Categories.Developer,

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions.js

@@ -1,7 +1,7 @@
 import { localize2 } from 'vscode/vscode/vs/nls';
 import { Action2, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { NOTEBOOK_ACTIONS_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { NOTEBOOK_ACTIONS_CATEGORY } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
 const TOGGLE_CELL_TOOLBAR_POSITION = 'notebook.toggleCellToolbarPosition';
@@ -9,7 +9,7 @@ class ToggleCellToolbarPositionAction extends Action2 {
     constructor() {
         super({
             id: TOGGLE_CELL_TOOLBAR_POSITION,
-            title: ( localize2(8299, 'Toggle Cell Toolbar Position')),
+            title: ( localize2(8098, 'Toggle Cell Toolbar Position')),
             menu: [{
                     id: MenuId.NotebookCellTitle,
                     group: 'View',

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider.js

@@ -7,7 +7,7 @@ import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { NotebookOverviewRulerLane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { throttle } from 'vscode/vscode/vs/base/common/decorators';
 import 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.js

@@ -27,10 +27,10 @@ import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undo
 import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_EDITOR_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { NotebookAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { NotebookAction } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { CellEditorOptions } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { CellEditorOptions } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions';
 
 const NOTEBOOK_ADD_FIND_MATCH_TO_SELECTION_ID = 'notebook.addFindMatchToSelection';
 var NotebookMultiCursorState;
@@ -676,7 +676,7 @@ class NotebookAddMatchToMultiSelectionAction extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_ADD_FIND_MATCH_TO_SELECTION_ID,
-            title: ( localize(8365, "Add Find Match to Selection")),
+            title: ( localize(8163, "Add Find Match to Selection")),
             precondition: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)),
                 NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -710,7 +710,7 @@ class NotebookExitMultiSelectionAction extends NotebookAction {
     constructor() {
         super({
             id: 'noteMultiCursor.exit',
-            title: ( localize(8366, "Exit Multi Cursor Mode")),
+            title: ( localize(8164, "Exit Multi Cursor Mode")),
             precondition: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)),
                 NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -741,7 +741,7 @@ class NotebookDeleteLeftMultiSelectionAction extends NotebookAction {
     constructor() {
         super({
             id: 'noteMultiCursor.deleteLeft',
-            title: ( localize(8367, "Delete Left")),
+            title: ( localize(8165, "Delete Left")),
             precondition: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)),
                 NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -780,7 +780,7 @@ class NotebookDeleteRightMultiSelectionAction extends NotebookAction {
     constructor() {
         super({
             id: 'noteMultiCursor.deleteRight',
-            title: ( localize(8368, "Delete Right")),
+            title: ( localize(8166, "Delete Right")),
             precondition: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)),
                 NOTEBOOK_IS_ACTIVE_EDITOR,

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

@@ -9,8 +9,8 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 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 { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
+import { NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, findTargetCellEditor, NotebookAction } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/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, IS_COMPOSITE_NOTEBOOK, NOTEBOOK_CELL_HAS_OUTPUTS } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
@@ -31,7 +31,7 @@ registerAction2(class extends Action2 {
         super({
             id: 'notebook.cell.nullAction',
             title: ( localize(
-                8301,
+                8099,
                 "Keypresses that should be handled by the focused element in the cell output."
             )),
             keybinding: [{
@@ -54,7 +54,7 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_NEXT_EDITOR,
-            title: ( localize(8302, 'Focus Next Cell Editor')),
+            title: ( localize(8100, 'Focus Next Cell Editor')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -129,7 +129,7 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_PREVIOUS_EDITOR,
-            title: ( localize(8303, 'Focus Previous Cell Editor')),
+            title: ( localize(8101, 'Focus Previous Cell Editor')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -195,7 +195,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_TOP,
-            title: ( localize(8304, 'Focus First Cell')),
+            title: ( localize(8102, 'Focus First Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
@@ -227,7 +227,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_BOTTOM,
-            title: ( localize(8305, 'Focus Last Cell')),
+            title: ( localize(8103, 'Focus Last Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
@@ -264,7 +264,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_IN_OUTPUT_COMMAND_ID,
-            title: ( localize(8306, 'Focus In Active Cell Output')),
+            title: ( localize(8104, 'Focus In Active Cell Output')),
             keybinding: [{
                     primary: 2048  | 1024  | 18 ,
                     mac: { primary: 256  | 2048  | 18 , },
@@ -288,7 +288,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_OUT_OUTPUT_COMMAND_ID,
-            title: ( localize(8307, 'Focus Out Active Cell Output')),
+            title: ( localize(8105, 'Focus Out Active Cell Output')),
             keybinding: {
                 primary: 2048  | 1024  | 16 ,
                 mac: { primary: 256  | 2048  | 16 , },
@@ -307,7 +307,7 @@ registerAction2(class CenterActiveCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: CENTER_ACTIVE_CELL,
-            title: ( localize(8308, "Center Active Cell")),
+            title: ( localize(8106, "Center Active Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: 2048  | 42 ,
@@ -326,7 +326,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_COMMAND_ID,
-            title: ( localize(8309, "Cell Cursor Page Up")),
+            title: ( localize(8107, "Cell Cursor Page Up")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -348,7 +348,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_SELECT_COMMAND_ID,
-            title: ( localize(8310, "Cell Cursor Page Up Select")),
+            title: ( localize(8108, "Cell Cursor Page Up Select")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -371,7 +371,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_COMMAND_ID,
-            title: ( localize(8311, "Cell Cursor Page Down")),
+            title: ( localize(8109, "Cell Cursor Page Down")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -393,7 +393,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_SELECT_COMMAND_ID,
-            title: ( localize(8312, "Cell Cursor Page Down Select")),
+            title: ( localize(8110, "Cell Cursor Page Down Select")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -427,7 +427,7 @@ function getPageSize(context) {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8313,
+                8111,
                 "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

@@ -6,11 +6,12 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { NOTEBOOK_VARIABLE_VIEW_ENABLED } from './notebookVariableContextKeys.js';
 import { NotebookVariablesView } from './notebookVariablesView.js';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { variablesViewIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { variablesViewIcon } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
@@ -18,13 +19,14 @@ import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/co
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 let NotebookVariables = class NotebookVariables extends Disposable {
-    constructor(contextKeyService, configurationService, editorService, notebookExecutionStateService, notebookKernelService, notebookDocumentService) {
+    constructor(contextKeyService, configurationService, editorService, notebookExecutionStateService, notebookKernelService, notebookDocumentService, viewDescriptorService) {
         super();
         this.configurationService = configurationService;
         this.editorService = editorService;
         this.notebookExecutionStateService = notebookExecutionStateService;
         this.notebookKernelService = notebookKernelService;
         this.notebookDocumentService = notebookDocumentService;
+        this.viewDescriptorService = viewDescriptorService;
         this.listeners = [];
         this.initialized = false;
         this.viewEnabled = NOTEBOOK_VARIABLE_VIEW_ENABLED.bindTo(contextKeyService);
@@ -34,20 +36,14 @@ let NotebookVariables = class NotebookVariables extends Disposable {
     }
     handleConfigChange(e) {
         if (e.affectsConfiguration(NotebookSetting.notebookVariablesView)) {
-            if (!this.configurationService.getValue(NotebookSetting.notebookVariablesView)) {
-                this.viewEnabled.set(false);
-            }
-            else if (this.initialized) {
-                this.viewEnabled.set(true);
-            }
-            else {
-                this.handleInitEvent();
-            }
+            this.handleInitEvent();
         }
     }
     handleInitEvent(notebook) {
-        if (this.configurationService.getValue(NotebookSetting.notebookVariablesView)
-            && (!!notebook || this.editorService.activeEditorPane?.getId() === 'workbench.editor.notebook')) {
+        const enabled = this.editorService.activeEditorPane?.getId() === 'workbench.editor.repl' ||
+            this.configurationService.getValue(NotebookSetting.notebookVariablesView) ||
+            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);
                 this.initialized = true;
@@ -62,13 +58,13 @@ let NotebookVariables = class NotebookVariables extends Disposable {
         return notebook && this.notebookKernelService.getMatchingKernel(notebook).selected?.hasVariableProvider;
     }
     initializeView() {
-        const debugViewContainer = ( (Registry.as('workbench.registry.view.containers'))).get(VIEWLET_ID);
+        const debugViewContainer = this.viewDescriptorService.getViewContainerById(VIEWLET_ID);
         if (debugViewContainer) {
             const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
             const viewDescriptor = {
-                id: 'NOTEBOOK_VARIABLES', name: ( localize2(8389, "Notebook Variables")),
+                id: 'workbench.notebook.variables', name: ( localize2(8187, "Notebook Variables")),
                 containerIcon: variablesViewIcon, ctorDescriptor: ( (new SyncDescriptor(NotebookVariablesView))),
-                order: 50, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: false, 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;
@@ -87,7 +83,8 @@ NotebookVariables = ( (__decorate([
     ( (__param(2, IEditorService))),
     ( (__param(3, INotebookExecutionStateService))),
     ( (__param(4, INotebookKernelService))),
-    ( (__param(5, INotebookService)))
+    ( (__param(5, INotebookService))),
+    ( (__param(6, IViewDescriptorService)))
 ], NotebookVariables)));
 
 export { NotebookVariables };

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

@@ -16,7 +16,10 @@ class NotebookVariableDataSource {
         this.cancellationTokenSource = ( (new CancellationTokenSource()));
     }
     async getChildren(element) {
-        if (element.kind === 'root') {
+        if (element.kind === 'empty') {
+            return [];
+        }
+        else if (element.kind === 'root') {
             return this.getRootVariables(element.notebook);
         }
         else {
@@ -74,7 +77,7 @@ class NotebookVariableDataSource {
                     notebook: parent.notebook,
                     id: parent.id + `${last + 1}`,
                     extHostId: parent.extHostId,
-                    name: ( localize(11620, "Display limit reached")),
+                    name: ( localize(11744, "Display limit reached")),
                     value: '',
                     indexedChildrenCount: 0,
                     hasNamedChildren: false

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

@@ -4,7 +4,7 @@ import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import 'vscode/vscode/vs/platform/list/browser/listService';
-import { DebugExpressionRenderer } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer';
+import { DebugExpressionRenderer } from '@codingame/monaco-vscode-debug-notebook-common/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer';
 
 var NotebookVariableRenderer_1;
 const $ = $$1;
@@ -55,10 +55,10 @@ NotebookVariableRenderer = NotebookVariableRenderer_1 = ( (__decorate([
 ], NotebookVariableRenderer)));
 class NotebookVariableAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(11621, "Notebook Variables"));
+        return ( localize(11745, "Notebook Variables"));
     }
     getAriaLabel(element) {
-        return ( localize(11622, "Variable {0}, value {1}", element.name, element.value));
+        return ( localize(11746, "Variable {0}, value {1}", element.name, element.value));
     }
 }
 

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

@@ -31,8 +31,8 @@ var NotebookVariablesView_1;
 let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
     static { NotebookVariablesView_1 = this; }
     static { this.ID = 'notebookVariablesView'; }
-    static { this.NOTEBOOK_TITLE = ( localize2(10914, "Notebook Variables")); }
-    static { this.REPL_TITLE = ( localize2(10915, "REPL Variables")); }
+    static { this.NOTEBOOK_TITLE = ( localize2(10983, "Notebook Variables")); }
+    static { this.REPL_TITLE = ( localize2(10984, "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;
@@ -41,10 +41,11 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         this.quickInputService = quickInputService;
         this.commandService = commandService;
         this.menuService = menuService;
-        this._register(this.editorService.onDidActiveEditorChange(this.handleActiveEditorChange.bind(this)));
+        this._register(this.editorService.onDidActiveEditorChange(() => this.handleActiveEditorChange()));
         this._register(this.notebookKernelService.onDidNotebookVariablesUpdate(this.handleVariablesChanged.bind(this)));
         this._register(this.notebookExecutionStateService.onDidChangeExecution(this.handleExecutionStateChange.bind(this)));
-        this.activeNotebook = this.getActiveNotebook()?.notebookDocument;
+        this._register(this.editorService.onDidCloseEditor((e) => this.handleCloseEditor(e)));
+        this.handleActiveEditorChange(false);
         this.dataSource = ( (new NotebookVariableDataSource(this.notebookKernelService)));
         this.updateScheduler = ( (new RunOnceScheduler(() => this.tree?.updateChildren(), 100)));
     }
@@ -95,26 +96,34 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         super.layoutBody(height, width);
         this.tree?.layout(height, width);
     }
-    setActiveNotebook(notebookDocument, editor) {
+    setActiveNotebook(notebookDocument, editor, doUpdate = true) {
         this.activeNotebook = notebookDocument;
-        this.tree?.setInput({ kind: 'root', notebook: notebookDocument });
-        this.updateScheduler.schedule();
         if (isCompositeNotebookEditorInput(editor.input)) {
             this.updateTitle(NotebookVariablesView_1.REPL_TITLE.value);
         }
         else {
             this.updateTitle(NotebookVariablesView_1.NOTEBOOK_TITLE.value);
         }
+        if (doUpdate) {
+            this.tree?.setInput({ kind: 'root', notebook: notebookDocument });
+            this.updateScheduler.schedule();
+        }
     }
     getActiveNotebook() {
         const notebookEditor = this.editorService.activeEditorPane;
         const notebookDocument = getNotebookEditorFromEditorPane(notebookEditor)?.textModel;
         return notebookDocument && notebookEditor ? { notebookDocument, notebookEditor } : undefined;
     }
-    handleActiveEditorChange() {
+    handleCloseEditor(e) {
+        if (e.editor.resource && ( (e.editor.resource.toString())) === this.activeNotebook?.uri.toString()) {
+            this.tree?.setInput({ kind: 'empty' });
+            this.updateScheduler.schedule();
+        }
+    }
+    handleActiveEditorChange(doUpdate = true) {
         const found = this.getActiveNotebook();
         if (found && found.notebookDocument !== this.activeNotebook) {
-            this.setActiveNotebook(found.notebookDocument, found.notebookEditor);
+            this.setActiveNotebook(found.notebookDocument, found.notebookEditor, doUpdate);
         }
     }
     handleExecutionStateChange(event) {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.js

@@ -44,7 +44,7 @@ import { disposableTimeout, Delayer } from 'vscode/vscode/vs/base/common/async';
 import { IOutlinePane } from 'vscode/vscode/vs/workbench/contrib/outline/browser/outline';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { INotebookCellOutlineDataSourceFactory } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.service';
+import { INotebookCellOutlineDataSourceFactory } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.service';
 import { NotebookExecutionType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
@@ -716,33 +716,33 @@ const NotebookOutlineContext = {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8314,
+                8112,
                 "When enabled, notebook outline will show only markdown cells containing a header."
             ))
         },
         [NotebookSetting.outlineShowCodeCells]: {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(8315, "When enabled, notebook outline shows code cells."))
+            markdownDescription: ( localize(8113, "When enabled, notebook outline shows code cells."))
         },
         [NotebookSetting.outlineShowCodeCellSymbols]: {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8316,
+                8114,
                 "When enabled, notebook outline shows code cell symbols. Relies on `notebook.outline.showCodeCells` being enabled."
             ))
         },
         [NotebookSetting.breadcrumbsShowCodeCells]: {
             type: 'boolean',
             default: true,
-            markdownDescription: ( localize(8317, "When enabled, notebook breadcrumbs contain code cells."))
+            markdownDescription: ( localize(8115, "When enabled, notebook breadcrumbs contain code cells."))
         },
         [NotebookSetting.gotoSymbolsAllSymbols]: {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8318,
+                8116,
                 "When enabled, the Go to Symbol Quick Pick will display full code symbols from the notebook, as well as Markdown headers."
             ))
         },
@@ -750,7 +750,7 @@ const NotebookOutlineContext = {
 });
 MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
     submenu: MenuId.NotebookOutlineFilter,
-    title: ( localize(8319, "Filter Entries")),
+    title: ( localize(8117, "Filter Entries")),
     icon: Codicon.filter,
     group: 'navigation',
     order: -1,
@@ -763,7 +763,7 @@ registerAction2(class ToggleShowMarkdownHeadersOnly extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleShowMarkdownHeadersOnly',
-            title: ( localize(8320, "Markdown Headers Only")),
+            title: ( localize(8118, "Markdown Headers Only")),
             f1: false,
             toggled: {
                 condition: ( (ContextKeyExpr.equals('config.notebook.outline.showMarkdownHeadersOnly', true)))
@@ -784,7 +784,7 @@ registerAction2(class ToggleCodeCellEntries extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleCodeCells',
-            title: ( localize(8321, "Code Cells")),
+            title: ( localize(8119, "Code Cells")),
             f1: false,
             toggled: {
                 condition: ( (ContextKeyExpr.equals('config.notebook.outline.showCodeCells', true)))
@@ -806,7 +806,7 @@ registerAction2(class ToggleCodeCellSymbolEntries extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleCodeCellSymbols',
-            title: ( localize(8322, "Code Cell Symbols")),
+            title: ( localize(8120, "Code Cell Symbols")),
             f1: false,
             toggled: {
                 condition: ( (ContextKeyExpr.equals('config.notebook.outline.showCodeCellSymbols', true)))

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile.js

@@ -52,7 +52,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.setProfile',
-            title: ( localize(8323, "Set Profile"))
+            title: ( localize(8121, "Set Profile"))
         });
     }
     async run(accessor, args) {