@codingame/monaco-vscode-notebook-service-override 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.js

@@ -1,20 +1,23 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_OUTPUT_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { getNotebookEditorFromEditorPane, expandCellRangesWithHiddenCells, cellRangeToViewCells } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_OUTPUT_FOCUSED } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { getNotebookEditorFromEditorPane, expandCellRangesWithHiddenCells, cellRangeToViewCells } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CopyAction, PasteAction, CutAction } from 'vscode/vscode/vs/editor/contrib/clipboard/browser/clipboard';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
-import { cloneNotebookCellTextModel } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { SelectionStateType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { cloneNotebookCellTextModel } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
+import { SelectionStateType, CellEditType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { isNative } from 'vscode/vscode/vs/base/common/platform';
 import { registerAction2, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { NotebookCellAction, NotebookAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { NotebookCellAction, CellOverflowToolbarGroups, NotebookAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 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 { UndoCommand, RedoCommand } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -108,10 +111,10 @@ function runPasteCells(editor, activeCell, pasteCells) {
         const newFocusIndex = typeof currCellIndex === 'number' ? currCellIndex + 1 : 0;
         textModel.applyEdits([
             {
-                editType: 1 ,
+                editType: CellEditType.Replace,
                 index: newFocusIndex,
                 count: 0,
-                cells: ( (pasteCells.items.map(cell => cloneNotebookCellTextModel(cell))))
+                cells: ( pasteCells.items.map(cell => cloneNotebookCellTextModel(cell)))
             }
         ], true, originalState, () => ({
             kind: SelectionStateType.Index,
@@ -125,10 +128,10 @@ function runPasteCells(editor, activeCell, pasteCells) {
         }
         textModel.applyEdits([
             {
-                editType: 1 ,
+                editType: CellEditType.Replace,
                 index: 0,
                 count: 0,
-                cells: ( (pasteCells.items.map(cell => cloneNotebookCellTextModel(cell))))
+                cells: ( pasteCells.items.map(cell => cloneNotebookCellTextModel(cell)))
             }
         ], true, originalState, () => ({
             kind: SelectionStateType.Index,
@@ -163,8 +166,8 @@ function runCopyCells(accessor, editor, targetCell) {
     if (!selectedCells.length) {
         return false;
     }
-    clipboardService.writeText(( (selectedCells.map(cell => cell.getText()))).join('\n'));
-    notebookService.setToCopy(( (selectedCells.map(cell => cell.model))), true);
+    clipboardService.writeText(( selectedCells.map(cell => cell.getText())).join('\n'));
+    notebookService.setToCopy(( selectedCells.map(cell => cell.model)), true);
     return true;
 }
 function runCutCells(accessor, editor, targetCell) {
@@ -182,11 +185,11 @@ function runCutCells(accessor, editor, targetCell) {
             clipboardService.writeText(targetCell.getText());
             const focus = editor.getFocus();
             const newFocus = focus.end <= targetCellIndex ? focus : { start: focus.start - 1, end: focus.end - 1 };
-            const newSelections = ( (selections.map(
+            const newSelections = ( selections.map(
                 selection => (selection.end <= targetCellIndex ? selection : { start: selection.start - 1, end: selection.end - 1 })
-            )));
+            ));
             textModel.applyEdits([
-                { editType: 1 , index: targetCellIndex, count: 1, cells: [] }
+                { editType: CellEditType.Replace, index: targetCellIndex, count: 1, cells: [] }
             ], true, { kind: SelectionStateType.Index, focus: editor.getFocus(), selections: selections }, () => ({ kind: SelectionStateType.Index, focus: newFocus, selections: newSelections }), undefined, true);
             notebookService.setToCopy([targetCell.model], false);
             return true;
@@ -198,11 +201,11 @@ function runCutCells(accessor, editor, targetCell) {
         const targetCell = editor.cellAt(focus.start);
         clipboardService.writeText(targetCell.getText());
         const newFocus = focus.end === editor.getLength() ? { start: focus.start - 1, end: focus.end - 1 } : focus;
-        const newSelections = ( (selections.map(
+        const newSelections = ( selections.map(
             selection => (selection.end <= focus.start ? selection : { start: selection.start - 1, end: selection.end - 1 })
-        )));
+        ));
         textModel.applyEdits([
-            { editType: 1 , index: focus.start, count: 1, cells: [] }
+            { editType: CellEditType.Replace, index: focus.start, count: 1, cells: [] }
         ], true, { kind: SelectionStateType.Index, focus: editor.getFocus(), selections: selections }, () => ({ kind: SelectionStateType.Index, focus: newFocus, selections: newSelections }), undefined, true);
         notebookService.setToCopy([targetCell.model], false);
         return true;
@@ -212,10 +215,10 @@ function runCutCells(accessor, editor, targetCell) {
     if (!selectedCells.length) {
         return false;
     }
-    clipboardService.writeText(( (selectedCells.map(cell => cell.getText()))).join('\n'));
-    const edits = ( (selectionRanges.map(
-        range => ({ editType: 1 , index: range.start, count: range.end - range.start, cells: [] })
-    )));
+    clipboardService.writeText(( selectedCells.map(cell => cell.getText())).join('\n'));
+    const edits = ( selectionRanges.map(
+        range => ({ editType: CellEditType.Replace, index: range.start, count: range.end - range.start, cells: [] })
+    ));
     const firstSelectIndex = selectionRanges[0].start;
     const newFocusedCellIndex = firstSelectIndex < textModel.cells.length - 1
         ? firstSelectIndex
@@ -227,7 +230,7 @@ function runCutCells(accessor, editor, targetCell) {
             selections: [{ start: newFocusedCellIndex, end: newFocusedCellIndex + 1 }]
         };
     }, undefined, true);
-    notebookService.setToCopy(( (selectedCells.map(cell => cell.model))), false);
+    notebookService.setToCopy(( selectedCells.map(cell => cell.model)), false);
     return true;
 }
 let NotebookClipboardContribution = class NotebookClipboardContribution extends Disposable {
@@ -335,10 +338,10 @@ let NotebookClipboardContribution = class NotebookClipboardContribution extends
         return runCutCells(accessor, editor, undefined);
     }
 };
-NotebookClipboardContribution = ( (__decorate([
-    ( (__param(0, IEditorService)))
-], NotebookClipboardContribution)));
-registerWorkbenchContribution2(NotebookClipboardContribution.ID, NotebookClipboardContribution, 2 );
+NotebookClipboardContribution = ( __decorate([
+    ( __param(0, IEditorService))
+], NotebookClipboardContribution));
+registerWorkbenchContribution2(NotebookClipboardContribution.ID, NotebookClipboardContribution, WorkbenchPhase.BlockRestore);
 const COPY_CELL_COMMAND_ID = 'notebook.cell.copy';
 const CUT_CELL_COMMAND_ID = 'notebook.cell.cut';
 const PASTE_CELL_COMMAND_ID = 'notebook.cell.paste';
@@ -347,18 +350,18 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_COMMAND_ID,
-            title: ( localize(8111, "Copy Cell")),
+            title: ( localize(7315, "Copy Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: NOTEBOOK_EDITOR_FOCUSED,
-                group: "1_copy" ,
+                group: CellOverflowToolbarGroups.Copy,
                 order: 2,
             },
             keybinding: isNative ? undefined : {
-                primary: 2048  | 33 ,
-                win: { primary: 2048  | 33 , secondary: [2048  | 19 ] },
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                weight: 200
+                primary: KeyMod.CtrlCmd | KeyCode.KeyC,
+                win: { primary: KeyMod.CtrlCmd | KeyCode.KeyC, secondary: [KeyMod.CtrlCmd | KeyCode.Insert] },
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
@@ -370,18 +373,18 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: CUT_CELL_COMMAND_ID,
-            title: ( localize(8112, "Cut Cell")),
+            title: ( localize(7316, "Cut Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE))),
-                group: "1_copy" ,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE)),
+                group: CellOverflowToolbarGroups.Copy,
                 order: 1,
             },
             keybinding: isNative ? undefined : {
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                primary: 2048  | 54 ,
-                win: { primary: 2048  | 54 , secondary: [1024  | 20 ] },
-                weight: 200
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
+                primary: KeyMod.CtrlCmd | KeyCode.KeyX,
+                win: { primary: KeyMod.CtrlCmd | KeyCode.KeyX, secondary: [KeyMod.Shift | KeyCode.Delete] },
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
@@ -393,19 +396,19 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: PASTE_CELL_COMMAND_ID,
-            title: ( localize(8113, "Paste Cell")),
+            title: ( localize(7317, "Paste Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE))),
-                group: "1_copy" ,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE)),
+                group: CellOverflowToolbarGroups.Copy,
                 order: 3,
             },
             keybinding: isNative ? undefined : {
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                primary: 2048  | 52 ,
-                win: { primary: 2048  | 52 , secondary: [1024  | 19 ] },
-                linux: { primary: 2048  | 52 , secondary: [1024  | 19 ] },
-                weight: 100
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
+                primary: KeyMod.CtrlCmd | KeyCode.KeyV,
+                win: { primary: KeyMod.CtrlCmd | KeyCode.KeyV, secondary: [KeyMod.Shift | KeyCode.Insert] },
+                linux: { primary: KeyMod.CtrlCmd | KeyCode.KeyV, secondary: [KeyMod.Shift | KeyCode.Insert] },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -425,10 +428,10 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: PASTE_CELL_ABOVE_COMMAND_ID,
-            title: ( localize(8114, "Paste Cell Above")),
+            title: ( localize(7318, "Paste Cell Above")),
             keybinding: {
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                primary: 2048  | 1024  | 52 ,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
+                primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyV,
                 weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
             },
         });
@@ -453,10 +456,10 @@ registerAction2(class extends NotebookCellAction {
         const newFocusIndex = currCellIndex;
         textModel.applyEdits([
             {
-                editType: 1 ,
+                editType: CellEditType.Replace,
                 index: currCellIndex,
                 count: 0,
-                cells: ( (pasteCells.items.map(cell => cloneNotebookCellTextModel(cell))))
+                cells: ( pasteCells.items.map(cell => cloneNotebookCellTextModel(cell)))
             }
         ], true, originalState, () => ({
             kind: SelectionStateType.Index,
@@ -469,7 +472,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleNotebookClipboardLog',
-            title: ( localize2(8115, 'Toggle Notebook Clipboard Troubleshooting')),
+            title: ( localize2(7319, 'Toggle Notebook Clipboard Troubleshooting')),
             category: Categories.Developer,
             f1: true
         });
@@ -486,10 +489,10 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.output.selectAll',
-            title: ( localize(8116, "Select All")),
+            title: ( localize(7320, "Select All")),
             keybinding: {
-                primary: 2048  | 31 ,
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
+                primary: KeyMod.CtrlCmd | KeyCode.KeyA,
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED)),
                 weight: NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT
             }
         });

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.d.ts

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
@@ -6,10 +7,11 @@ import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
-import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookCellsChangeType, CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 let NotebookBreakpoints = class NotebookBreakpoints extends Disposable {
     constructor(_debugService, _notebookService, _editorService) {
@@ -103,4 +105,4 @@ NotebookBreakpoints = ( __decorate([
     ( __param(1, INotebookService)),
     ( __param(2, IEditorService))
 ], NotebookBreakpoints));
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookBreakpoints, 3 );
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookBreakpoints, LifecyclePhase.Restored);

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookCellPausing.d.ts

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookCellPausing.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -8,6 +9,7 @@ import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/d
 import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { CellExecutionUpdateType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 let NotebookCellPausing = class NotebookCellPausing extends Disposable {
     constructor(_debugService, _notebookExecutionStateService) {
@@ -64,4 +66,4 @@ NotebookCellPausing = ( __decorate([
     ( __param(0, IDebugService)),
     ( __param(1, INotebookExecutionStateService))
 ], NotebookCellPausing));
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookCellPausing, 3 );
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookCellPausing, LifecyclePhase.Restored);

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.d.ts

@@ -0,0 +1,28 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IDebugService } from "vscode/vscode/vs/workbench/contrib/debug/common/debug.service";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookExecutionStateService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
+export declare class PausedCellDecorationContribution extends Disposable implements INotebookEditorContribution {
+    private readonly _notebookEditor;
+    private readonly _debugService;
+    private readonly _notebookExecutionStateService;
+    static id: string;
+    private _currentTopDecorations;
+    private _currentOtherDecorations;
+    private _executingCellDecorations;
+    constructor(_notebookEditor: INotebookEditor, _debugService: IDebugService, _notebookExecutionStateService: INotebookExecutionStateService);
+    private updateExecutionDecorations;
+    private setTopFrameDecoration;
+    private setFocusedFrameDecoration;
+    private setExecutingCellDecorations;
+}
+export declare class NotebookBreakpointDecorations extends Disposable implements INotebookEditorContribution {
+    private readonly _notebookEditor;
+    private readonly _debugService;
+    private readonly _configService;
+    static id: string;
+    private _currentDecorations;
+    constructor(_notebookEditor: INotebookEditor, _debugService: IDebugService, _configService: IConfigurationService);
+    private updateDecorations;
+}

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.js

@@ -1,16 +1,17 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Delayer } from 'vscode/vscode/vs/base/common/async';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { debugIconBreakpointForeground } from '@codingame/monaco-vscode-debug-notebook-common/vscode/vs/workbench/contrib/debug/browser/breakpointEditorContribution';
-import { topStackFrameColor, focusedStackFrameColor } from 'vscode/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
+import { debugIconBreakpointForeground } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/breakpointEditorContribution';
+import { topStackFrameColor, focusedStackFrameColor } from '@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
-import { NotebookOverviewRulerLane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { runningCellRulerDecorationColor } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';
+import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { runningCellRulerDecorationColor } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';
 import { CellUri, NotebookCellExecutionState } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookExecutionType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { NotebookExecutionType } from '@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 
 let PausedCellDecorationContribution = class PausedCellDecorationContribution extends Disposable {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.d.ts

@@ -0,0 +1,20 @@
+import { ICodeEditor } from "vscode/vscode/vs/editor/browser/editorBrowser";
+import { ICommandService } from "vscode/vscode/vs/platform/commands/common/commands.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextMenuService } from "vscode/vscode/vs/platform/contextview/browser/contextView.service";
+import { IHoverService } from "vscode/vscode/vs/platform/hover/browser/hover.service";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+import { IProductService } from "vscode/vscode/vs/platform/product/common/productService.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IChatAgentService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
+import { EmptyTextEditorHintContribution, IEmptyTextEditorHintOptions } from "../../../../codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js";
+import { IInlineChatSessionService } from "vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service";
+import { IEditorGroupsService } from "vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+export declare class EmptyCellEditorHintContribution extends EmptyTextEditorHintContribution {
+    private readonly _editorService;
+    static readonly CONTRIB_ID = "notebook.editor.contrib.emptyCellEditorHint";
+    constructor(editor: ICodeEditor, _editorService: IEditorService, editorGroupsService: IEditorGroupsService, commandService: ICommandService, configurationService: IConfigurationService, hoverService: IHoverService, keybindingService: IKeybindingService, inlineChatSessionService: IInlineChatSessionService, chatAgentService: IChatAgentService, telemetryService: ITelemetryService, productService: IProductService, contextMenuService: IContextMenuService);
+    protected _getOptions(): IEmptyTextEditorHintOptions;
+    protected _shouldRenderHint(): boolean;
+}

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.js

@@ -1,6 +1,7 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { registerEditorContribution, EditorContributionInstantiation } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
@@ -11,7 +12,7 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { EmptyTextEditorHintContribution } from '../../../../codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js';
 import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
-import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
@@ -30,10 +31,6 @@ let EmptyCellEditorHintContribution = class EmptyCellEditorHintContribution exte
         return { clickable: false };
     }
     _shouldRenderHint() {
-        const shouldRenderHint = super._shouldRenderHint();
-        if (!shouldRenderHint) {
-            return false;
-        }
         const model = this.editor.getModel();
         if (!model) {
             return false;
@@ -43,7 +40,11 @@ let EmptyCellEditorHintContribution = class EmptyCellEditorHintContribution exte
             return false;
         }
         const activeEditor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
-        if (!activeEditor) {
+        if (!activeEditor || !activeEditor.isDisposed) {
+            return false;
+        }
+        const shouldRenderHint = super._shouldRenderHint();
+        if (!shouldRenderHint) {
             return false;
         }
         const activeCell = activeEditor.getActiveCell();
@@ -66,6 +67,6 @@ EmptyCellEditorHintContribution = ( __decorate([
     ( __param(10, IProductService)),
     ( __param(11, IContextMenuService))
 ], EmptyCellEditorHintContribution));
-registerEditorContribution(EmptyCellEditorHintContribution.CONTRIB_ID, EmptyCellEditorHintContribution, 0 );
+registerEditorContribution(EmptyCellEditorHintContribution.CONTRIB_ID, EmptyCellEditorHintContribution, EditorContributionInstantiation.Eager);
 
 export { EmptyCellEditorHintContribution };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.d.ts

@@ -0,0 +1 @@
+export {};