@codingame/monaco-vscode-api 9.0.3 → 10.0.0

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

@@ -52,7 +52,7 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { PANEL_BORDER, SIDE_BAR_BACKGROUND, EDITOR_PANE_BACKGROUND } from '../../../common/theme.js';
 import { debugIconStartForeground } from '../../debug/browser/debugColors.js';
-import { CellEditState, CellFocusMode, CellRevealType, CellRevealRangeType, ScrollToRevealBehavior, RenderOutputType } from './notebookBrowser.js';
+import { CellEditState, CellFocusMode, CellRevealRangeType, ScrollToRevealBehavior } from './notebookBrowser.js';
 import { NotebookEditorExtensionsRegistry } from './notebookEditorExtensions.js';
 import { INotebookEditorService } from './services/notebookEditorService.service.js';
 import { notebookDebug } from './notebookLogger.js';
@@ -71,7 +71,7 @@ import { NotebookEditorWorkbenchToolbar } from './viewParts/notebookEditorToolba
 import { NotebookEditorContextKeys } from './viewParts/notebookEditorWidgetContextKeys.js';
 import { NotebookOverviewRuler } from './viewParts/notebookOverviewRuler.js';
 import { ListTopCellToolbar } from './viewParts/notebookTopCellToolbar.js';
-import { SelectionStateType, RENDERER_NOT_AVAILABLE, CellKind, NotebookFindScopeType, CellEditType } from '../common/notebookCommon.js';
+import { SelectionStateType, RENDERER_NOT_AVAILABLE, CellKind, NotebookFindScopeType } from '../common/notebookCommon.js';
 import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CURSOR_NAVIGATION_MODE } from '../common/notebookContextKeys.js';
 import { INotebookExecutionService } from '../common/notebookExecutionService.service.js';
 import { INotebookExecutionStateService } from '../common/notebookExecutionStateService.service.js';
@@ -90,7 +90,6 @@ import { Schemas } from '../../../../base/common/network.js';
 import { DropIntoEditorController } from '../../../../editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js';
 import { CopyPasteController } from '../../../../editor/contrib/dropOrPasteInto/browser/copyPasteController.js';
 import { NotebookStickyScroll } from './viewParts/notebookEditorStickyScroll.js';
-import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
 import { PreventDefaultContextMenuItemsContextKeyName } from '../../webview/browser/webview.contribution.js';
@@ -257,9 +256,8 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this._pendingLayouts = ( (new WeakMap()));
         this._pendingOutputHeightAcks = ( (new Map()));
         this._dimension = dimension;
-        this.isEmbedded = creationOptions.isEmbedded ?? false;
+        this.isReplHistory = creationOptions.isReplHistory ?? false;
         this._readOnly = creationOptions.isReadOnly ?? false;
-        this._inRepl = creationOptions.forRepl ?? false;
         this._overlayContainer = document.createElement('div');
         this.scopedContextKeyService = this._register(contextKeyService.createScoped(this._overlayContainer));
         this.instantiationService = this._register(instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.scopedContextKeyService])))));
@@ -751,7 +749,8 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             this.notebookExecutionStateService,
             () => this.viewModel,
             this.keybindingService,
-            this.configurationService
+            this.configurationService,
+            this.isReplHistory
         )));
         this._register(accessibilityProvider);
         this._list = this.instantiationService.createInstance(NotebookCellList, 'NotebookCellList', this._body, this._viewContext.notebookOptions, this._listDelegate, renderers, this.scopedContextKeyService, {
@@ -848,7 +847,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this._registerNotebookActionsToolbar();
         this._registerNotebookStickyScroll();
         this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(AccessibilityVerbositySettingId.Notebook)) {
+            if (e.affectsConfiguration(accessibilityProvider.verbositySettingId)) {
                 this._list.ariaLabel = accessibilityProvider?.getWidgetAriaLabel();
             }
         }));
@@ -856,8 +855,16 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
     showListContextMenu(e) {
         this.contextMenuService.showContextMenu({
             menuId: MenuId.NotebookCellTitle,
+            menuActionOptions: {
+                shouldForwardArgs: true
+            },
             contextKeyService: this.scopedContextKeyService,
-            getAnchor: () => e.anchor
+            getAnchor: () => e.anchor,
+            getActionsContext: () => {
+                return {
+                    from: 'cellContainer'
+                };
+            }
         });
     }
     _registerNotebookOverviewRuler() {
@@ -917,11 +924,11 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
     setParentContextKeyService(parentContextKeyService) {
         this.scopedContextKeyService.updateParent(parentContextKeyService);
     }
-    async setModel(textModel, viewState, perf) {
+    async setModel(textModel, viewState, perf, viewType) {
         if (this.viewModel === undefined || !this.viewModel.equal(textModel)) {
             const oldBottomToolbarDimensions = this._notebookOptions.computeBottomToolbarDimensions(this.viewModel?.viewType);
             this._detachModel();
-            await this._attachModel(textModel, viewState, perf);
+            await this._attachModel(textModel, viewType ?? textModel.viewType, viewState, perf);
             const newBottomToolbarDimensions = this._notebookOptions.computeBottomToolbarDimensions(this.viewModel?.viewType);
             if (oldBottomToolbarDimensions.bottomToolbarGap !== newBottomToolbarDimensions.bottomToolbarGap
                 || oldBottomToolbarDimensions.bottomToolbarHeight !== newBottomToolbarDimensions.bottomToolbarHeight) {
@@ -1026,7 +1033,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
                     ))));
                 }
                 else {
-                    this._list.revealCell(cell, options?.cellRevealType ?? CellRevealType.CenterIfOutsideViewport);
+                    this._list.revealCell(cell, options?.cellRevealType ?? 4 );
                 }
                 const editor = this._renderedEditors.get(cell);
                 if (editor) {
@@ -1168,9 +1175,9 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this._webview.element.style.width = '100%';
         this._list.attachWebview(this._webview.element);
     }
-    async _attachModel(textModel, viewState, perf) {
+    async _attachModel(textModel, viewType, viewState, perf) {
         this._ensureWebview(this.getId(), textModel.viewType, textModel.uri);
-        this.viewModel = this.instantiationService.createInstance(NotebookViewModel, textModel.viewType, textModel, this._viewContext, this.getLayoutInfo(), { isReadOnly: this._readOnly, inRepl: this._inRepl });
+        this.viewModel = this.instantiationService.createInstance(NotebookViewModel, viewType, textModel, this._viewContext, this.getLayoutInfo(), { isReadOnly: this._readOnly });
         this._viewContext.eventDispatcher.emit([( (new NotebookLayoutChangedEvent({ width: true, fontInfo: true }, this.getLayoutInfo())))]);
         this.notebookOptions.updateOptions(this._readOnly);
         this._updateForOptions();
@@ -1453,7 +1460,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         return state;
     }
     _allowScrollBeyondLastLine() {
-        return this._scrollBeyondLastLine && !this.isEmbedded;
+        return this._scrollBeyondLastLine && !this.isReplHistory;
     }
     getBodyHeight(dimensionHeight) {
         return Math.max(dimensionHeight - (this._notebookTopToolbar?.useGlobalToolbar ?  26 : 0), 0);
@@ -1698,19 +1705,19 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         return this._list.revealCells(range);
     }
     revealInView(cell) {
-        return this._list.revealCell(cell, CellRevealType.Default);
+        return this._list.revealCell(cell, 1 );
     }
     revealInViewAtTop(cell) {
-        this._list.revealCell(cell, CellRevealType.Top);
+        this._list.revealCell(cell, 2 );
     }
     revealInCenter(cell) {
-        this._list.revealCell(cell, CellRevealType.Center);
+        this._list.revealCell(cell, 3 );
     }
     async revealInCenterIfOutsideViewport(cell) {
-        await this._list.revealCell(cell, CellRevealType.CenterIfOutsideViewport);
+        await this._list.revealCell(cell, 4 );
     }
     async revealFirstLineIfOutsideViewport(cell) {
-        await this._list.revealCell(cell, CellRevealType.FirstLineIfOutsideViewport);
+        await this._list.revealCell(cell, 6 );
     }
     async revealLineInViewAsync(cell, line) {
         return this._list.revealRangeInCell(cell, ( (new Range(line, 1, line, 1))), CellRevealRangeType.Default);
@@ -2006,7 +2013,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             if (!renderer) {
                 return;
             }
-            const result = { type: RenderOutputType.Extension, renderer, source: output, mimeType: pickedMimeTypeRenderer.mimeType };
+            const result = { type: 1 , renderer, source: output, mimeType: pickedMimeTypeRenderer.mimeType };
             const inset = this._webview?.insetMapping.get(result.source);
             if (!inset || !inset.initialized) {
                 const p = ( (new Promise(resolve => {
@@ -2244,7 +2251,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             if (!this._list.webviewElement) {
                 return;
             }
-            if (output.type === RenderOutputType.Extension) {
+            if (output.type === 1 ) {
                 this.notebookRendererMessaging.prepare(output.renderer.id);
             }
             const webviewTop = parseInt(this._list.webviewElement.domNode.style.top, 10);
@@ -2252,7 +2259,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             const cellTop = this._list.getCellViewScrollTop(cell) + top;
             const existingOutput = this._webview.insetMapping.get(output.source);
             if (!existingOutput
-                || (!existingOutput.renderer && output.type === RenderOutputType.Extension)) {
+                || ((!existingOutput.renderer && output.type === 1) )) {
                 if (createWhenIdle) {
                     this._webview.requestCreateOutputWhenWebviewIdle({ cellId: cell.id, cellHandle: cell.handle, cellUri: cell.uri, executionId: cell.internalMetadata.executionId }, output, cellTop, offset);
                 }
@@ -2261,7 +2268,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
                 }
             }
             else if (existingOutput.renderer
-                && output.type === RenderOutputType.Extension
+                && output.type === 1
                 && existingOutput.renderer.id !== output.renderer.id) {
                 this._webview.removeInsets([output.source]);
                 this._webview.createOutput({ cellId: cell.id, cellHandle: cell.handle, cellUri: cell.uri }, output, cellTop, offset);
@@ -2296,7 +2303,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             if (!( (this._webview.insetMapping.has(output.source)))) {
                 return this.createOutput(cell, output, offset, false);
             }
-            if (output.type === RenderOutputType.Extension) {
+            if (output.type === 1 ) {
                 this.notebookRendererMessaging.prepare(output.renderer.id);
             }
             const webviewTop = parseInt(this._list.webviewElement.domNode.style.top, 10);
@@ -2497,7 +2504,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             renderDurationMap[rendererId] = (renderDurationMap[rendererId] ?? 0) + duration;
             this.textModel.applyEdits([
                 {
-                    editType: CellEditType.PartialInternalMetadata,
+                    editType: 9 ,
                     index: cellIndex,
                     internalMetadata: {
                         executionId: executionId,
@@ -2584,43 +2591,43 @@ const notebookCellBorder = registerColor('notebook.cellBorderColor', {
     light: ( (transparent(listInactiveSelectionBackground, 1))),
     hcDark: PANEL_BORDER,
     hcLight: PANEL_BORDER
-}, ( localize(7817, "The border color for notebook cells.")));
-registerColor('notebook.focusedEditorBorder', focusBorder, ( localize(7818, "The color of the notebook cell editor border.")));
-const cellStatusIconSuccess = registerColor('notebookStatusSuccessIcon.foreground', debugIconStartForeground, ( localize(7819, "The error icon color of notebook cells in the cell status bar.")));
+}, ( localize(7888, "The border color for notebook cells.")));
+registerColor('notebook.focusedEditorBorder', focusBorder, ( localize(7889, "The color of the notebook cell editor border.")));
+const cellStatusIconSuccess = registerColor('notebookStatusSuccessIcon.foreground', debugIconStartForeground, ( localize(7890, "The error icon color of notebook cells in the cell status bar.")));
 const runningCellRulerDecorationColor = registerColor('notebookEditorOverviewRuler.runningCellForeground', debugIconStartForeground, ( localize(
-    7820,
+    7891,
     "The color of the running cell decoration in the notebook editor overview ruler."
 )));
-const cellStatusIconError = registerColor('notebookStatusErrorIcon.foreground', errorForeground, ( localize(7821, "The error icon color of notebook cells in the cell status bar.")));
-registerColor('notebookStatusRunningIcon.foreground', foreground, ( localize(7822, "The running icon color of notebook cells in the cell status bar.")));
-registerColor('notebook.outputContainerBorderColor', null, ( localize(7823, "The border color of the notebook output container.")));
-registerColor('notebook.outputContainerBackgroundColor', null, ( localize(7824, "The color of the notebook output container background.")));
+const cellStatusIconError = registerColor('notebookStatusErrorIcon.foreground', errorForeground, ( localize(7892, "The error icon color of notebook cells in the cell status bar.")));
+registerColor('notebookStatusRunningIcon.foreground', foreground, ( localize(7893, "The running icon color of notebook cells in the cell status bar.")));
+registerColor('notebook.outputContainerBorderColor', null, ( localize(7894, "The border color of the notebook output container.")));
+registerColor('notebook.outputContainerBackgroundColor', null, ( localize(7895, "The color of the notebook output container background.")));
 registerColor('notebook.cellToolbarSeparator', {
     dark: ( (( (Color.fromHex('#808080'))).transparent(0.35))),
     light: ( (( (Color.fromHex('#808080'))).transparent(0.35))),
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(7825, "The color of the separator in the cell bottom toolbar")));
-const focusedCellBackground = registerColor('notebook.focusedCellBackground', null, ( localize(7826, "The background color of a cell when the cell is focused.")));
+}, ( localize(7896, "The color of the separator in the cell bottom toolbar")));
+const focusedCellBackground = registerColor('notebook.focusedCellBackground', null, ( localize(7897, "The background color of a cell when the cell is focused.")));
 registerColor('notebook.selectedCellBackground', {
     dark: listInactiveSelectionBackground,
     light: listInactiveSelectionBackground,
     hcDark: null,
     hcLight: null
-}, ( localize(7827, "The background color of a cell when the cell is selected.")));
+}, ( localize(7898, "The background color of a cell when the cell is selected.")));
 registerColor('notebook.cellHoverBackground', {
     dark: ( (transparent(focusedCellBackground, .5))),
     light: ( (transparent(focusedCellBackground, .7))),
     hcDark: null,
     hcLight: null
-}, ( localize(7828, "The background color of a cell when the cell is hovered.")));
+}, ( localize(7899, "The background color of a cell when the cell is hovered.")));
 registerColor('notebook.selectedCellBorder', {
     dark: notebookCellBorder,
     light: notebookCellBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
 }, ( localize(
-    7829,
+    7900,
     "The color of the cell's top and bottom border when the cell is selected but not focused."
 )));
 registerColor('notebook.inactiveSelectedCellBorder', {
@@ -2628,13 +2635,13 @@ registerColor('notebook.inactiveSelectedCellBorder', {
     light: null,
     hcDark: focusBorder,
     hcLight: focusBorder
-}, ( localize(7830, "The color of the cell's borders when multiple cells are selected.")));
+}, ( localize(7901, "The color of the cell's borders when multiple cells are selected.")));
 registerColor('notebook.focusedCellBorder', focusBorder, ( localize(
-    7831,
+    7902,
     "The color of the cell's focus indicator borders when the cell is focused."
 )));
 registerColor('notebook.inactiveFocusedCellBorder', notebookCellBorder, ( localize(
-    7832,
+    7903,
     "The color of the cell's top and bottom border when a cell is focused while the primary focus is outside of the editor."
 )));
 registerColor('notebook.cellStatusBarItemHoverBackground', {
@@ -2642,27 +2649,27 @@ registerColor('notebook.cellStatusBarItemHoverBackground', {
     dark: ( (new Color( (new RGBA(255, 255, 255, 0.15))))),
     hcDark: ( (new Color( (new RGBA(255, 255, 255, 0.15))))),
     hcLight: ( (new Color( (new RGBA(0, 0, 0, 0.08))))),
-}, ( localize(7833, "The background color of notebook cell status bar items.")));
-registerColor('notebook.cellInsertionIndicator', focusBorder, ( localize(7834, "The color of the notebook cell insertion indicator.")));
-registerColor('notebookScrollbarSlider.background', scrollbarSliderBackground, ( localize(7835, "Notebook scrollbar slider background color.")));
-registerColor('notebookScrollbarSlider.hoverBackground', scrollbarSliderHoverBackground, ( localize(7836, "Notebook scrollbar slider background color when hovering.")));
-registerColor('notebookScrollbarSlider.activeBackground', scrollbarSliderActiveBackground, ( localize(7837, "Notebook scrollbar slider background color when clicked on.")));
+}, ( localize(7904, "The background color of notebook cell status bar items.")));
+registerColor('notebook.cellInsertionIndicator', focusBorder, ( localize(7905, "The color of the notebook cell insertion indicator.")));
+registerColor('notebookScrollbarSlider.background', scrollbarSliderBackground, ( localize(7906, "Notebook scrollbar slider background color.")));
+registerColor('notebookScrollbarSlider.hoverBackground', scrollbarSliderHoverBackground, ( localize(7907, "Notebook scrollbar slider background color when hovering.")));
+registerColor('notebookScrollbarSlider.activeBackground', scrollbarSliderActiveBackground, ( localize(7908, "Notebook scrollbar slider background color when clicked on.")));
 registerColor('notebook.symbolHighlightBackground', {
     dark: ( (Color.fromHex('#ffffff0b'))),
     light: ( (Color.fromHex('#fdff0033'))),
     hcDark: null,
     hcLight: null
-}, ( localize(7838, "Background color of highlighted cell")));
+}, ( localize(7909, "Background color of highlighted cell")));
 registerColor('notebook.cellEditorBackground', {
     light: SIDE_BAR_BACKGROUND,
     dark: SIDE_BAR_BACKGROUND,
     hcDark: null,
     hcLight: null
-}, ( localize(7839, "Cell editor background color.")));
+}, ( localize(7910, "Cell editor background color.")));
 const notebookEditorBackground = registerColor('notebook.editorBackground', {
     light: EDITOR_PANE_BACKGROUND,
     dark: EDITOR_PANE_BACKGROUND,
     hcDark: null,
     hcLight: null
-}, ( localize(7840, "Notebook background color.")));
+}, ( localize(7911, "Notebook background color.")));
 export { NotebookEditorWidget, cellStatusIconError, cellStatusIconSuccess, focusedCellBackground, getDefaultNotebookCreationOptions, notebookCellBorder, runningCellRulerDecorationColor };

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

@@ -1,32 +1,32 @@
 import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const selectKernelIcon = registerIcon('notebook-kernel-select', Codicon.serverEnvironment, ( localize(5608, 'Configure icon to select a kernel in notebook editors.')));
-const executeIcon = registerIcon('notebook-execute', Codicon.play, ( localize(5609, 'Icon to execute in notebook editors.')));
-const executeAboveIcon = registerIcon('notebook-execute-above', Codicon.runAbove, ( localize(5610, 'Icon to execute above cells in notebook editors.')));
-const executeBelowIcon = registerIcon('notebook-execute-below', Codicon.runBelow, ( localize(5611, 'Icon to execute below cells in notebook editors.')));
-const stopIcon = registerIcon('notebook-stop', Codicon.primitiveSquare, ( localize(5612, 'Icon to stop an execution in notebook editors.')));
-const deleteCellIcon = registerIcon('notebook-delete-cell', Codicon.trash, ( localize(5613, 'Icon to delete a cell in notebook editors.')));
-const executeAllIcon = registerIcon('notebook-execute-all', Codicon.runAll, ( localize(5614, 'Icon to execute all cells in notebook editors.')));
-const editIcon = registerIcon('notebook-edit', Codicon.pencil, ( localize(5615, 'Icon to edit a cell in notebook editors.')));
-const stopEditIcon = registerIcon('notebook-stop-edit', Codicon.check, ( localize(5616, 'Icon to stop editing a cell in notebook editors.')));
-const moveUpIcon = registerIcon('notebook-move-up', Codicon.arrowUp, ( localize(5617, 'Icon to move up a cell in notebook editors.')));
-const moveDownIcon = registerIcon('notebook-move-down', Codicon.arrowDown, ( localize(5618, 'Icon to move down a cell in notebook editors.')));
-const clearIcon = registerIcon('notebook-clear', Codicon.clearAll, ( localize(5619, 'Icon to clear cell outputs in notebook editors.')));
-const splitCellIcon = registerIcon('notebook-split-cell', Codicon.splitVertical, ( localize(5620, 'Icon to split a cell in notebook editors.')));
-const successStateIcon = registerIcon('notebook-state-success', Codicon.check, ( localize(5621, 'Icon to indicate a success state in notebook editors.')));
-const errorStateIcon = registerIcon('notebook-state-error', Codicon.error, ( localize(5622, 'Icon to indicate an error state in notebook editors.')));
-const pendingStateIcon = registerIcon('notebook-state-pending', Codicon.clock, ( localize(5623, 'Icon to indicate a pending state in notebook editors.')));
-const executingStateIcon = registerIcon('notebook-state-executing', Codicon.sync, ( localize(5624, 'Icon to indicate an executing state in notebook editors.')));
-const collapsedIcon = registerIcon('notebook-collapsed', Codicon.chevronRight, ( localize(5625, 'Icon to annotate a collapsed section in notebook editors.')));
-const expandedIcon = registerIcon('notebook-expanded', Codicon.chevronDown, ( localize(5626, 'Icon to annotate an expanded section in notebook editors.')));
-const openAsTextIcon = registerIcon('notebook-open-as-text', Codicon.fileCode, ( localize(5627, 'Icon to open the notebook in a text editor.')));
-const revertIcon = registerIcon('notebook-revert', Codicon.discard, ( localize(5628, 'Icon to revert in notebook editors.')));
-const toggleWhitespace = registerIcon('notebook-diff-cell-toggle-whitespace', Codicon.whitespace, ( localize(5629, 'Icon for the toggle whitespace action in the diff editor.')));
-const renderOutputIcon = registerIcon('notebook-render-output', Codicon.preview, ( localize(5630, 'Icon to render output in diff editor.')));
-const mimetypeIcon = registerIcon('notebook-mimetype', Codicon.code, ( localize(5631, 'Icon for a mime type in notebook editors.')));
-const copyIcon = registerIcon('notebook-copy', Codicon.copy, ( localize(5632, 'Icon to copy content to clipboard')));
-const previousChangeIcon = registerIcon('notebook-diff-editor-previous-change', Codicon.arrowUp, ( localize(5633, 'Icon for the previous change action in the diff editor.')));
-const nextChangeIcon = registerIcon('notebook-diff-editor-next-change', Codicon.arrowDown, ( localize(5634, 'Icon for the next change action in the diff editor.')));
-const variablesViewIcon = registerIcon('variables-view-icon', Codicon.debugAlt, ( localize(5635, 'View icon of the variables view.')));
+const selectKernelIcon = registerIcon('notebook-kernel-select', Codicon.serverEnvironment, ( localize(5675, 'Configure icon to select a kernel in notebook editors.')));
+const executeIcon = registerIcon('notebook-execute', Codicon.play, ( localize(5676, 'Icon to execute in notebook editors.')));
+const executeAboveIcon = registerIcon('notebook-execute-above', Codicon.runAbove, ( localize(5677, 'Icon to execute above cells in notebook editors.')));
+const executeBelowIcon = registerIcon('notebook-execute-below', Codicon.runBelow, ( localize(5678, 'Icon to execute below cells in notebook editors.')));
+const stopIcon = registerIcon('notebook-stop', Codicon.primitiveSquare, ( localize(5679, 'Icon to stop an execution in notebook editors.')));
+const deleteCellIcon = registerIcon('notebook-delete-cell', Codicon.trash, ( localize(5680, 'Icon to delete a cell in notebook editors.')));
+const executeAllIcon = registerIcon('notebook-execute-all', Codicon.runAll, ( localize(5681, 'Icon to execute all cells in notebook editors.')));
+const editIcon = registerIcon('notebook-edit', Codicon.pencil, ( localize(5682, 'Icon to edit a cell in notebook editors.')));
+const stopEditIcon = registerIcon('notebook-stop-edit', Codicon.check, ( localize(5683, 'Icon to stop editing a cell in notebook editors.')));
+const moveUpIcon = registerIcon('notebook-move-up', Codicon.arrowUp, ( localize(5684, 'Icon to move up a cell in notebook editors.')));
+const moveDownIcon = registerIcon('notebook-move-down', Codicon.arrowDown, ( localize(5685, 'Icon to move down a cell in notebook editors.')));
+const clearIcon = registerIcon('notebook-clear', Codicon.clearAll, ( localize(5686, 'Icon to clear cell outputs in notebook editors.')));
+const splitCellIcon = registerIcon('notebook-split-cell', Codicon.splitVertical, ( localize(5687, 'Icon to split a cell in notebook editors.')));
+const successStateIcon = registerIcon('notebook-state-success', Codicon.check, ( localize(5688, 'Icon to indicate a success state in notebook editors.')));
+const errorStateIcon = registerIcon('notebook-state-error', Codicon.error, ( localize(5689, 'Icon to indicate an error state in notebook editors.')));
+const pendingStateIcon = registerIcon('notebook-state-pending', Codicon.clock, ( localize(5690, 'Icon to indicate a pending state in notebook editors.')));
+const executingStateIcon = registerIcon('notebook-state-executing', Codicon.sync, ( localize(5691, 'Icon to indicate an executing state in notebook editors.')));
+const collapsedIcon = registerIcon('notebook-collapsed', Codicon.chevronRight, ( localize(5692, 'Icon to annotate a collapsed section in notebook editors.')));
+const expandedIcon = registerIcon('notebook-expanded', Codicon.chevronDown, ( localize(5693, 'Icon to annotate an expanded section in notebook editors.')));
+const openAsTextIcon = registerIcon('notebook-open-as-text', Codicon.fileCode, ( localize(5694, 'Icon to open the notebook in a text editor.')));
+const revertIcon = registerIcon('notebook-revert', Codicon.discard, ( localize(5695, 'Icon to revert in notebook editors.')));
+const toggleWhitespace = registerIcon('notebook-diff-cell-toggle-whitespace', Codicon.whitespace, ( localize(5696, 'Icon for the toggle whitespace action in the diff editor.')));
+const renderOutputIcon = registerIcon('notebook-render-output', Codicon.preview, ( localize(5697, 'Icon to render output in diff editor.')));
+const mimetypeIcon = registerIcon('notebook-mimetype', Codicon.code, ( localize(5698, 'Icon for a mime type in notebook editors.')));
+const copyIcon = registerIcon('notebook-copy', Codicon.copy, ( localize(5699, 'Icon to copy content to clipboard')));
+const previousChangeIcon = registerIcon('notebook-diff-editor-previous-change', Codicon.arrowUp, ( localize(5700, 'Icon for the previous change action in the diff editor.')));
+const nextChangeIcon = registerIcon('notebook-diff-editor-next-change', Codicon.arrowDown, ( localize(5701, 'Icon for the next change action in the diff editor.')));
+const variablesViewIcon = registerIcon('variables-view-icon', Codicon.debugAlt, ( localize(5702, 'View icon of the variables view.')));
 export { clearIcon, collapsedIcon, copyIcon, deleteCellIcon, editIcon, errorStateIcon, executeAboveIcon, executeAllIcon, executeBelowIcon, executeIcon, executingStateIcon, expandedIcon, mimetypeIcon, moveDownIcon, moveUpIcon, nextChangeIcon, openAsTextIcon, pendingStateIcon, previousChangeIcon, renderOutputIcon, revertIcon, selectKernelIcon, splitCellIcon, stopEditIcon, stopIcon, successStateIcon, toggleWhitespace, variablesViewIcon };

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

@@ -6,7 +6,6 @@ import { isObject } from '../../../../base/common/types.js';
 import { FontMeasurements } from '../../../../editor/browser/config/fontMeasurements.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { BareFontInfo } from '../../../../editor/common/config/fontInfo.js';
-import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { NotebookSetting } from '../common/notebookCommon.js';
 import { INotebookExecutionStateService } from '../common/notebookExecutionStateService.service.js';
@@ -158,7 +157,7 @@ let NotebookOptions = class NotebookOptions extends Disposable {
                 affectsConfiguration(configuration) {
                     return configuration === NotebookSetting.insertToolbarLocation;
                 },
-                source: ConfigurationTarget.DEFAULT,
+                source: 7 ,
                 affectedKeys: ( new Set([NotebookSetting.insertToolbarLocation])),
                 change: { keys: [NotebookSetting.insertToolbarLocation], overrides: [] },
             });
@@ -209,28 +208,28 @@ let NotebookOptions = class NotebookOptions extends Disposable {
     _migrateDeprecatedSetting(deprecatedKey, key) {
         const deprecatedSetting = this.configurationService.inspect(deprecatedKey);
         if (deprecatedSetting.application !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.APPLICATION);
-            this.configurationService.updateValue(key, deprecatedSetting.application.value, ConfigurationTarget.APPLICATION);
+            this.configurationService.updateValue(deprecatedKey, undefined, 1 );
+            this.configurationService.updateValue(key, deprecatedSetting.application.value, 1 );
         }
         if (deprecatedSetting.user !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.USER);
-            this.configurationService.updateValue(key, deprecatedSetting.user.value, ConfigurationTarget.USER);
+            this.configurationService.updateValue(deprecatedKey, undefined, 2 );
+            this.configurationService.updateValue(key, deprecatedSetting.user.value, 2 );
         }
         if (deprecatedSetting.userLocal !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.USER_LOCAL);
-            this.configurationService.updateValue(key, deprecatedSetting.userLocal.value, ConfigurationTarget.USER_LOCAL);
+            this.configurationService.updateValue(deprecatedKey, undefined, 3 );
+            this.configurationService.updateValue(key, deprecatedSetting.userLocal.value, 3 );
         }
         if (deprecatedSetting.userRemote !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.USER_REMOTE);
-            this.configurationService.updateValue(key, deprecatedSetting.userRemote.value, ConfigurationTarget.USER_REMOTE);
+            this.configurationService.updateValue(deprecatedKey, undefined, 4 );
+            this.configurationService.updateValue(key, deprecatedSetting.userRemote.value, 4 );
         }
         if (deprecatedSetting.workspace !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.WORKSPACE);
-            this.configurationService.updateValue(key, deprecatedSetting.workspace.value, ConfigurationTarget.WORKSPACE);
+            this.configurationService.updateValue(deprecatedKey, undefined, 5 );
+            this.configurationService.updateValue(key, deprecatedSetting.workspace.value, 5 );
         }
         if (deprecatedSetting.workspaceFolder !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.WORKSPACE_FOLDER);
-            this.configurationService.updateValue(key, deprecatedSetting.workspaceFolder.value, ConfigurationTarget.WORKSPACE_FOLDER);
+            this.configurationService.updateValue(deprecatedKey, undefined, 6 );
+            this.configurationService.updateValue(key, deprecatedSetting.workspaceFolder.value, 6 );
         }
     }
     _computeOutputLineHeight(lineHeight, outputFontSize) {

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
 import { coalesce } from '../../../../../../base/common/arrays.js';
-import { DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { DisposableMap, DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { EDITOR_FONT_DEFAULTS } from '../../../../../../editor/common/config/editorOptions.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
@@ -19,9 +19,8 @@ let CellComments = class CellComments extends CellContentPart {
         this.commentService = commentService;
         this.configurationService = configurationService;
         this.instantiationService = instantiationService;
-        this._commentThreadDisposables = this._register(( new DisposableStore()));
         this.container.classList.add('review-widget');
-        this._register(this._commentThreadWidget = ( new MutableDisposable()));
+        this._register(this._commentThreadWidgets = ( new DisposableMap()));
         this._register(this.themeService.onDidColorThemeChange(this._applyTheme, this));
         this._applyTheme();
     }
@@ -33,20 +32,22 @@ let CellComments = class CellComments extends CellContentPart {
         await this._updateThread();
     }
     async _createCommentTheadWidget(owner, commentThread) {
-        this._commentThreadDisposables.clear();
-        this._commentThreadWidget.value = this.instantiationService.createInstance(CommentThreadWidget, this.container, this.notebookEditor, owner, this.notebookEditor.textModel.uri, this.contextKeyService, this.instantiationService, commentThread, undefined, undefined, {
+        const widgetDisposables = ( new DisposableStore());
+        const widget = this.instantiationService.createInstance(CommentThreadWidget, this.container, this.notebookEditor, owner, this.notebookEditor.textModel.uri, this.contextKeyService, this.instantiationService, commentThread, undefined, undefined, {
             codeBlockFontFamily: this.configurationService.getValue('editor').fontFamily || EDITOR_FONT_DEFAULTS.fontFamily
         }, undefined, {
             actionRunner: () => {
             },
             collapse: () => { }
         });
+        widgetDisposables.add(widget);
+        this._commentThreadWidgets.set(commentThread.threadId, { widget, dispose: () => widgetDisposables.dispose() });
         const layoutInfo = this.notebookEditor.getLayoutInfo();
-        await this._commentThreadWidget.value.display(layoutInfo.fontInfo.lineHeight, true);
+        await widget.display(layoutInfo.fontInfo.lineHeight, true);
         this._applyTheme();
-        this._commentThreadDisposables.add(this._commentThreadWidget.value.onDidResize(() => {
-            if (this.currentElement && this._commentThreadWidget.value) {
-                this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.value.getDimensions().height);
+        widgetDisposables.add(widget.onDidResize(() => {
+            if (this.currentElement) {
+                this.currentElement.commentHeight = this._calculateCommentThreadHeight(widget.getDimensions().height);
             }
         }));
     }
@@ -57,23 +58,29 @@ let CellComments = class CellComments extends CellContentPart {
         if (!this.currentElement) {
             return;
         }
-        const info = await this._getCommentThreadForCell(this.currentElement);
-        if (!this._commentThreadWidget.value && info) {
-            await this._createCommentTheadWidget(info.owner, info.thread);
-            this.container.style.top = `${this.currentElement.layoutInfo.commentOffset}px`;
-            this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.value.getDimensions().height);
-            return;
-        }
-        if (this._commentThreadWidget.value) {
+        const infos = await this._getCommentThreadsForCell(this.currentElement);
+        const widgetsToDelete = ( new Set(( this._commentThreadWidgets.keys())));
+        const layoutInfo = this.currentElement.layoutInfo;
+        this.container.style.top = `${layoutInfo.commentOffset}px`;
+        for (const info of infos) {
             if (!info) {
-                this._commentThreadDisposables.clear();
-                this._commentThreadWidget.value = undefined;
-                this.currentElement.commentHeight = 0;
-                return;
+                continue;
+            }
+            for (const thread of info.threads) {
+                widgetsToDelete.delete(thread.threadId);
+                const widget = this._commentThreadWidgets.get(thread.threadId)?.widget;
+                if (widget) {
+                    await widget.updateCommentThread(thread);
+                }
+                else {
+                    await this._createCommentTheadWidget(info.uniqueOwner, thread);
+                }
             }
-            await this._commentThreadWidget.value.updateCommentThread(info.thread);
-            this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.value.getDimensions().height);
         }
+        for (const threadId of widgetsToDelete) {
+            this._commentThreadWidgets.deleteAndDispose(threadId);
+        }
+        this._updateHeight();
     }
     _calculateCommentThreadHeight(bodyHeight) {
         const layoutInfo = this.notebookEditor.getLayoutInfo();
@@ -84,33 +91,38 @@ let CellComments = class CellComments extends CellContentPart {
         const computedHeight = headHeight + bodyHeight + arrowHeight + frameThickness + 8 ;
         return computedHeight;
     }
-    async _getCommentThreadForCell(element) {
+    _updateHeight() {
+        if (!this.currentElement) {
+            return;
+        }
+        let height = 0;
+        for (const { widget } of ( this._commentThreadWidgets.values())) {
+            height += this._calculateCommentThreadHeight(widget.getDimensions().height);
+        }
+        this.currentElement.commentHeight = height;
+    }
+    async _getCommentThreadsForCell(element) {
         if (this.notebookEditor.hasModel()) {
-            const commentInfos = coalesce(await this.commentService.getNotebookComments(element.uri));
-            for (const commentInfo of commentInfos) {
-                for (const thread of commentInfo.threads) {
-                    return { owner: commentInfo.uniqueOwner, thread };
-                }
-            }
+            return coalesce(await this.commentService.getNotebookComments(element.uri));
         }
-        return null;
+        return [];
     }
     _applyTheme() {
         const theme = this.themeService.getColorTheme();
         const fontInfo = this.notebookEditor.getLayoutInfo().fontInfo;
-        this._commentThreadWidget.value?.applyTheme(theme, fontInfo);
+        for (const { widget } of ( this._commentThreadWidgets.values())) {
+            widget.applyTheme(theme, fontInfo);
+        }
     }
     didRenderCell(element) {
         this.initialize(element);
         this._bindListeners();
     }
     prepareLayout() {
-        if (this.currentElement && this._commentThreadWidget.value) {
-            this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.value.getDimensions().height);
-        }
+        this._updateHeight();
     }
     updateInternalLayoutNow(element) {
-        if (this.currentElement && this._commentThreadWidget.value) {
+        if (this.currentElement) {
             this.container.style.top = `${element.layoutInfo.commentOffset}px`;
         }
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys.js

@@ -1,10 +1,11 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import '../../../../../../base/common/arrays.js';
-import '../../../../../../base/common/observableInternal/derived.js';
+import '../../../../../../base/common/event.js';
 import { autorun } from '../../../../../../base/common/observableInternal/autorun.js';
-import '../../../../../../base/common/observableInternal/utils.js';
+import '../../../../../../base/common/observableInternal/derived.js';
 import '../../../../../../base/common/cancellation.js';
+import '../../../../../../base/common/observableInternal/utils.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { NotebookChatController } from '../../controller/chat/notebookChatController.js';

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.js

@@ -5,7 +5,7 @@ import { isMacintosh } from '../../../../../../base/common/platform.js';
 import { expandCellRangesWithHiddenCells } from '../../notebookBrowser.js';
 import { CellContentPart } from '../cellPart.js';
 import { cloneNotebookCellTextModel } from '../../../common/model/notebookCellTextModel.js';
-import { CellEditType, SelectionStateType } from '../../../common/notebookCommon.js';
+import { SelectionStateType } from '../../../common/notebookCommon.js';
 import { cellRangesToIndexes } from '../../../common/notebookRange.js';
 const $ = $$1;
 const DRAGGING_CLASS = 'cell-dragging';
@@ -197,7 +197,7 @@ class CellDragAndDropController extends Disposable {
             }
             textModel.applyEdits([
                 {
-                    editType: CellEditType.Replace,
+                    editType: 1 ,
                     index: originalToIdx,
                     count: 0,
                     cells: ( cellRangesToIndexes([range]).map(
@@ -357,7 +357,7 @@ function performCellDropEdits(editor, draggedCell, dropDirection, draggedOverCel
         }
         const fromIndexDelta = range.start >= originalToIdx ? numCells : 0;
         const edit = {
-            editType: CellEditType.Move,
+            editType: 6 ,
             index: range.start + fromIndexDelta,
             length,
             newIdx