@codingame/monaco-vscode-notebook-service-override 3.2.2 → 4.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { getWindowById, append, $ as $$1, getWindow, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, getActiveWindow, scheduleAtNextAnimationFrame } from 'vscode/vscode/vs/base/browser/dom';
+import { append, $ as $$1, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, scheduleAtNextAnimationFrame } from 'vscode/vscode/vs/base/browser/dom';
 import { findLastIdx } from 'vscode/vscode/vs/base/common/arraysFind';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
@@ -11,7 +11,17 @@ import { SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from '
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { CellDiffSingleSideRenderer, CellDiffSideBySideRenderer, NotebookTextDiffList, NotebookCellTextDiffListDelegate } from './notebookDiffList.js';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { editorBackground, foreground, focusBorder, diffDiagonalFill } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import { foreground, focusBorder } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorBackground, diffDiagonalFill } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { INotebookEditorWorkerService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/services/notebookWorkerService';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { BareFontInfo } from 'vscode/vscode/vs/editor/common/config/fontInfo';
@@ -32,7 +42,6 @@ import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contr
 import { cellRangesToIndexes, cellIndexesToRanges } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookRange';
 import { NotebookDiffOverviewRuler } from './notebookDiffOverviewRuler.js';
 import { registerZIndex, ZIndex } from 'vscode/vscode/vs/platform/layout/browser/zIndexRegistry';
-import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 
 var NotebookTextDiffEditor_1;
@@ -76,8 +85,8 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
     get isDisposed() {
         return this._isDisposed;
     }
-    constructor(instantiationService, themeService, contextKeyService, notebookEditorWorkerService, configurationService, telemetryService, storageService, notebookExecutionStateService, codeEditorService) {
-        super(NotebookTextDiffEditor_1.ID, telemetryService, themeService, storageService);
+    constructor(group, instantiationService, themeService, contextKeyService, notebookEditorWorkerService, configurationService, telemetryService, storageService, notebookExecutionStateService, codeEditorService) {
+        super(NotebookTextDiffEditor_1.ID, group, telemetryService, themeService, storageService);
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
         this.notebookEditorWorkerService = notebookEditorWorkerService;
@@ -92,6 +101,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
         this.onMouseUp = this._onMouseUp.event;
         this._onDidScroll = this._register(( new Emitter()));
         this.onDidScroll = this._onDidScroll.event;
+        this.onDidChangeScroll = this._onDidScroll.event;
         this._model = null;
         this._modifiedResourceDisposableStore = this._register(( new DisposableStore()));
         this._insetModifyQueueByOutputId = ( new SequencerByKey());
@@ -103,7 +113,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
         this._isDisposed = false;
         this.pendingLayouts = ( new WeakMap());
         this._notebookOptions = ( new NotebookOptions(
-            getWindowById(this.group?.windowId, true).window ?? mainWindow,
+            this.window,
             this.configurationService,
             notebookExecutionStateService,
             codeEditorService,
@@ -119,9 +129,8 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
         return this._fontInfo;
     }
     createFontInfo() {
-        const window = getWindowById(this.group?.windowId, true).window;
         const editorOptions = this.configurationService.getValue('editor');
-        return FontMeasurements.readFontInfo(window, BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.getInstance(window).value));
+        return FontMeasurements.readFontInfo(this.window, BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.getInstance(this.window).value));
     }
     isOverviewRulerEnabled() {
         return this.configurationService.getValue(NotebookSetting.diffOverviewRuler) ?? false;
@@ -146,6 +155,21 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
     getScrollHeight() {
         return this._list?.scrollHeight ?? 0;
     }
+    getScrollPosition() {
+        return {
+            scrollTop: this.getScrollTop(),
+            scrollLeft: this._list?.scrollLeft ?? 0
+        };
+    }
+    setScrollPosition(scrollPosition) {
+        if (!this._list) {
+            return;
+        }
+        this._list.scrollTop = scrollPosition.scrollTop;
+        if (scrollPosition.scrollLeft !== undefined) {
+            this._list.scrollLeft = scrollPosition.scrollLeft;
+        }
+    }
     delegateVerticalScrollbarPointerDown(browserEvent) {
         this._list?.delegateVerticalScrollbarPointerDown(browserEvent);
     }
@@ -189,7 +213,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             this.instantiationService.createInstance(CellDiffSideBySideRenderer, this),
         ];
         this._listViewContainer = append(this._rootElement, $$1('.notebook-diff-list-view'));
-        this._list = this.instantiationService.createInstance(NotebookTextDiffList, 'NotebookTextDiff', this._listViewContainer, this.instantiationService.createInstance(NotebookCellTextDiffListDelegate, getWindow(this._listViewContainer)), renderers, this.contextKeyService, {
+        this._list = this.instantiationService.createInstance(NotebookTextDiffList, 'NotebookTextDiff', this._listViewContainer, this.instantiationService.createInstance(NotebookCellTextDiffListDelegate, this.window), renderers, this.contextKeyService, {
             setRowLineHeight: false,
             setRowHeight: false,
             supportDynamicHeights: true,
@@ -343,7 +367,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
     _attachModel() {
         this._eventDispatcher = ( new NotebookDiffEditorEventDispatcher());
         const updateInsets = () => {
-            scheduleAtNextAnimationFrame(getWindow(this._listViewContainer), () => {
+            scheduleAtNextAnimationFrame(this.window, () => {
                 if (this._isDisposed) {
                     return;
                 }
@@ -373,7 +397,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             fontFamily: this._generateFontFamily()
         }, undefined);
         this._list.rowsContainer.insertAdjacentElement('afterbegin', this._modifiedWebview.element);
-        this._modifiedWebview.createWebview(getActiveWindow());
+        this._modifiedWebview.createWebview(this.window);
         this._modifiedWebview.element.style.width = `calc(50% - 16px)`;
         this._modifiedWebview.element.style.left = `calc(50%)`;
     }
@@ -387,7 +411,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             fontFamily: this._generateFontFamily()
         }, undefined);
         this._list.rowsContainer.insertAdjacentElement('afterbegin', this._originalWebview.element);
-        this._originalWebview.createWebview(getActiveWindow());
+        this._originalWebview.createWebview(this.window);
         this._originalWebview.element.style.width = `calc(50% - 16px)`;
         this._originalWebview.element.style.left = `16px`;
     }
@@ -595,7 +619,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             diffSide = diffElement.type === 'insert' ? DiffSide.Modified : DiffSide.Original;
         }
         const webview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
-        scheduleAtNextAnimationFrame(getWindow(this._listViewContainer), () => {
+        scheduleAtNextAnimationFrame(this.window, () => {
             webview?.ackHeight([{ cellId: cellInfo.cellId, outputId, height }]);
         }, 10);
     }
@@ -607,7 +631,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             this.pendingLayouts.get(cell).dispose();
         }
         let r;
-        const layoutDisposable = scheduleAtNextAnimationFrame(getWindow(this._listViewContainer), () => {
+        const layoutDisposable = scheduleAtNextAnimationFrame(this.window, () => {
             this.pendingLayouts.delete(cell);
             relayout(cell, height);
             r();
@@ -752,9 +776,6 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
     getControl() {
         return this;
     }
-    setEditorVisible(visible, group) {
-        super.setEditorVisible(visible, group);
-    }
     clearInput() {
         super.clearInput();
         this._modifiedResourceDisposableStore.clear();
@@ -859,15 +880,15 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
     }
 };
 NotebookTextDiffEditor = NotebookTextDiffEditor_1 = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, IThemeService)),
-    ( __param(2, IContextKeyService)),
-    ( __param(3, INotebookEditorWorkerService)),
-    ( __param(4, IConfigurationService)),
-    ( __param(5, ITelemetryService)),
-    ( __param(6, IStorageService)),
-    ( __param(7, INotebookExecutionStateService)),
-    ( __param(8, ICodeEditorService))
+    ( __param(1, IInstantiationService)),
+    ( __param(2, IThemeService)),
+    ( __param(3, IContextKeyService)),
+    ( __param(4, INotebookEditorWorkerService)),
+    ( __param(5, IConfigurationService)),
+    ( __param(6, ITelemetryService)),
+    ( __param(7, IStorageService)),
+    ( __param(8, INotebookExecutionStateService)),
+    ( __param(9, ICodeEditorService))
 ], NotebookTextDiffEditor));
 registerZIndex(ZIndex.Base, 10, 'notebook-diff-view-viewport-slider');
 registerThemingParticipant((theme, collector) => {

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.js

@@ -11,7 +11,7 @@ import { WorkbenchList, IListService } from 'vscode/vscode/vs/platform/list/brow
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { DIFF_CELL_MARGIN } from './notebookDiffEditorBrowser.js';
 import { InsertElement, DeletedElement, getOptimizedNestedCodeEditorWidgetOptions, ModifiedElement } from './diffComponents.js';
-import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditorWidget';
+import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { DiffEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/diffEditor/diffEditorWidget';
 import { MenuItemAction, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
@@ -157,11 +157,11 @@ let CellDiffSideBySideRenderer = class CellDiffSideBySideRenderer {
         const inputToolbarContainer = append(sourceContainer, $('.editor-input-toolbar-container'));
         const cellToolbarContainer = append(inputToolbarContainer, $('div.property-toolbar'));
         const toolbar = this.instantiationService.createInstance(WorkbenchToolBar, cellToolbarContainer, {
-            actionViewItemProvider: action => {
+            actionViewItemProvider: (action, options) => {
                 if (action instanceof MenuItemAction) {
                     const item = ( new CodiconActionViewItem(
                         action,
-                        undefined,
+                        { hoverDelegate: options.hoverDelegate },
                         this.keybindingService,
                         this.notificationService,
                         this.contextKeyService,
@@ -217,7 +217,9 @@ let CellDiffSideBySideRenderer = class CellDiffSideBySideRenderer {
             dimension: {
                 height: 0,
                 width: 0
-            }
+            },
+            renderSideBySide: true,
+            useInlineViewWhenSpaceIsLimited: false
         }, {
             originalEditor: getOptimizedNestedCodeEditorWidgetOptions(),
             modifiedEditor: getOptimizedNestedCodeEditorWidgetOptions()

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.js

@@ -4,7 +4,17 @@ import { createFastDomNode } from 'vscode/vscode/vs/base/browser/fastDomNode';
 import { PixelRatio } from 'vscode/vscode/vs/base/browser/pixelRatio';
 import { Color } from 'vscode/vscode/vs/base/common/color';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { diffOverviewRulerInserted, diffInserted, defaultInsertColor, diffOverviewRulerRemoved, diffRemoved, defaultRemoveColor } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import { diffOverviewRulerInserted, diffInserted, defaultInsertColor, diffOverviewRulerRemoved, diffRemoved, defaultRemoveColor } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { Themable, IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 
 const MINIMUM_SLIDER_SIZE = 20;

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

@@ -21,7 +21,7 @@ import { NotebookEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/brow
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import './services/notebookServiceImpl.js';
-import { NotebookSetting, CellUri, NotebookWorkingCopyTypeIdentifier, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { NotebookSetting, CellUri, CellKind, NotebookWorkingCopyTypeIdentifier } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
 import { INotebookEditorModelResolverService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
@@ -32,6 +32,7 @@ import { Event } from 'vscode/vscode/vs/base/common/event';
 import './services/notebookEditorServiceImpl.js';
 import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { getFormattedMetadataJSON, getStreamOutputData } from './diff/diffElementViewModel.js';
+import '../common/notebookEditorModelResolverServiceImpl.js';
 import './services/notebookKernelServiceImpl.js';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService';
@@ -42,6 +43,7 @@ import './services/notebookRendererMessagingServiceImpl.js';
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import './controller/insertCellActions.js';
 import './controller/executeActions.js';
+import './controller/sectionActions.js';
 import './controller/layoutActions.js';
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/editActions';
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
@@ -64,7 +66,7 @@ import './contrib/cellStatusBar/contributedStatusBarItemController.js';
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
 import './contrib/editorStatusBar/editorStatusBar.js';
 import './contrib/undoRedo/notebookUndoRedo.js';
-import './contrib/cellCommands/cellCommands.js';
+import 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands';
 import './contrib/viewportWarmup/viewportWarmup.js';
 import './contrib/troubleshoot/layout.js';
 import './contrib/debug/notebookBreakpoints.js';
@@ -76,14 +78,16 @@ import './diff/notebookDiffActions.js';
 import { editorOptionsRegistry } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import './services/notebookExecutionStateServiceImpl.js';
 import './services/notebookExecutionServiceImpl.js';
+import 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService';
 import './services/notebookKeymapServiceImpl.js';
 import { PLAINTEXT_LANGUAGE_ID } from 'vscode/vscode/vs/editor/common/languages/modesRegistry';
+import 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { COMMENTEDITOR_DECORATION_KEY } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentReply';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import './services/notebookKernelHistoryServiceImpl.js';
 import './services/notebookLoggingServiceImpl.js';
-import product from 'vscode/vscode/vs/platform/product/common/product';
+import product$1 from 'vscode/vscode/vs/platform/product/common/product';
 import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_OUTPUT_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { runAccessibilityHelpAction, showAccessibleOutput } from './notebookAccessibility.js';
 import { IAccessibleViewService } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleView';
@@ -971,7 +975,7 @@ configurationRegistry.registerConfiguration({
             )),
             type: 'boolean',
             tags: ['notebookLayout', 'notebookOutputLayout'],
-            default: typeof product.quality === 'string' && product.quality !== 'stable'
+            default: typeof product$1.quality === 'string' && product$1.quality !== 'stable'
         },
         [NotebookSetting.outputWordWrap]: {
             markdownDescription: ( localizeWithPath(
@@ -1091,7 +1095,7 @@ configurationRegistry.registerConfiguration({
                 "Enables the incremental saving of notebooks in Remote environment. When enabled, only the changes to the notebook are sent to the extension host, improving performance for large notebooks and slow network connections."
             )),
             type: 'boolean',
-            default: typeof product.quality === 'string' && product.quality !== 'stable'
+            default: typeof product$1.quality === 'string' && product$1.quality !== 'stable'
         },
         [NotebookSetting.scrollToRevealCell]: {
             markdownDescription: ( localizeWithPath(
@@ -1154,7 +1158,7 @@ configurationRegistry.registerConfiguration({
             markdownDescription: ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/notebook.contribution',
                 'notebook.cellChat',
-                "Enable experimental cell chat for notebooks."
+                "Enable experimental floating chat widget in notebooks."
             )),
             type: 'boolean',
             default: false
@@ -1167,7 +1171,16 @@ configurationRegistry.registerConfiguration({
             )),
             type: 'boolean',
             default: false
-        }
+        },
+        [NotebookSetting.cellFailureDiagnostics]: {
+            markdownDescription: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/notebook.contribution',
+                'notebook.cellFailureDiagnostics',
+                "Show available diagnostics for cell failures."
+            )),
+            type: 'boolean',
+            default: true
+        },
     }
 });
 

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

@@ -126,7 +126,7 @@ function showAccessibleOutput(accessibleViewService, editorService) {
         }
         let text = `${mimeType}`;
         if (buffer) {
-            const charLimit = 100000;
+            const charLimit = 100_000;
             text = decoder.decode(buffer.data.slice(0, charLimit).buffer);
             if (buffer.data.byteLength > charLimit) {
                 text = text + '...(truncated)';

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl.js

@@ -452,6 +452,7 @@ let CellExecution = class CellExecution extends Disposable {
                     lastRunSuccess: completionData.lastRunSuccess,
                     runStartTime: this._didPause ? null : cellModel.internalMetadata.runStartTime,
                     runEndTime: this._didPause ? null : completionData.runEndTime,
+                    error: completionData.error
                 }
             };
             this._applyExecutionEdits([edit]);

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { LRUCache, ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import { ResourceMap, LRUCache } from 'vscode/vscode/vs/base/common/map';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';

package/vscode/src/vs/workbench/contrib/notebook/common/model/cellEdit.js

@@ -1,4 +1,7 @@
 class MoveCellEdit {
+    get label() {
+        return this.length === 1 ? 'Move Cell' : 'Move Cells';
+    }
     constructor(resource, fromIndex, length, toIndex, editingDelegate, beforedSelections, endSelections) {
         this.resource = resource;
         this.fromIndex = fromIndex;
@@ -8,8 +11,7 @@ class MoveCellEdit {
         this.beforedSelections = beforedSelections;
         this.endSelections = endSelections;
         this.type = 0 ;
-        this.label = 'Move Cell';
-        this.code = 'undoredo.notebooks.moveCell';
+        this.code = 'undoredo.textBufferEdit';
     }
     undo() {
         if (!this.editingDelegate.moveCell) {
@@ -25,6 +27,15 @@ class MoveCellEdit {
     }
 }
 class SpliceCellsEdit {
+    get label() {
+        if (this.diffs.length === 1 && this.diffs[0][1].length === 0) {
+            return this.diffs[0][2].length > 1 ? 'Insert Cells' : 'Insert Cell';
+        }
+        if (this.diffs.length === 1 && this.diffs[0][2].length === 0) {
+            return this.diffs[0][1].length > 1 ? 'Delete Cells' : 'Delete Cell';
+        }
+        return 'Insert Cell';
+    }
     constructor(resource, diffs, editingDelegate, beforeHandles, endHandles) {
         this.resource = resource;
         this.diffs = diffs;
@@ -32,8 +43,7 @@ class SpliceCellsEdit {
         this.beforeHandles = beforeHandles;
         this.endHandles = endHandles;
         this.type = 0 ;
-        this.label = 'Insert Cell';
-        this.code = 'undoredo.notebooks.insertCell';
+        this.code = 'undoredo.textBufferEdit';
     }
     undo() {
         if (!this.editingDelegate.replaceCell) {
@@ -61,7 +71,7 @@ class CellMetadataEdit {
         this.editingDelegate = editingDelegate;
         this.type = 0 ;
         this.label = 'Update Cell Metadata';
-        this.code = 'undoredo.notebooks.updateCellMetadata';
+        this.code = 'undoredo.textBufferEdit';
     }
     undo() {
         if (!this.editingDelegate.updateCellMetadata) {