@codingame/monaco-vscode-api 6.0.3 → 7.0.1

package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.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, CellEditType } from '../common/notebookCommon.js';
+import { SelectionStateType, RENDERER_NOT_AVAILABLE, CellKind, NotebookFindScopeType, CellEditType } 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';
@@ -93,7 +93,6 @@ 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 { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { PreventDefaultContextMenuItemsContextKeyName } from '../../webview/browser/webview.contribution.js';
 import { NotebookAccessibilityProvider } from './notebookAccessibilityProvider.js';
 const _moduleId = "vs/workbench/contrib/notebook/browser/notebookEditorWidget";
@@ -160,7 +159,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
     get notebookOptions() {
         return this._notebookOptions;
     }
-    constructor(creationOptions, dimension, instantiationService, editorGroupsService, notebookRendererMessaging, notebookEditorService, notebookKernelService, _notebookService, configurationService, contextKeyService, layoutService, contextMenuService, telemetryService, notebookExecutionService, notebookExecutionStateService, editorProgressService, logService, keybindingService, codeEditorService) {
+    constructor(creationOptions, dimension, instantiationService, editorGroupsService, notebookRendererMessaging, notebookEditorService, notebookKernelService, _notebookService, configurationService, contextKeyService, layoutService, contextMenuService, telemetryService, notebookExecutionService, notebookExecutionStateService, editorProgressService, logService, keybindingService) {
         super();
         this.creationOptions = creationOptions;
         this.notebookRendererMessaging = notebookRendererMessaging;
@@ -246,13 +245,12 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this._dimension = dimension;
         this.isEmbedded = creationOptions.isEmbedded ?? false;
         this._readOnly = creationOptions.isReadOnly ?? false;
-        this._notebookOptions = creationOptions.options ?? ( (new NotebookOptions(
-            this.creationOptions?.codeWindow ?? mainWindow,
-            this.configurationService,
-            notebookExecutionStateService,
-            codeEditorService,
-            this._readOnly
-        )));
+        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])))));
+        this._notebookOptions = creationOptions.options ??
+            this.instantiationService.createInstance(NotebookOptions, this.creationOptions?.codeWindow ?? mainWindow, this._readOnly, undefined);
         this._register(this._notebookOptions);
         const eventDispatcher = this._register(( (new NotebookEventDispatcher())));
         this._viewContext = ( (new ViewContext(
@@ -263,9 +261,6 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this._register(this._viewContext.eventDispatcher.onDidChangeCellState(e => {
             this._onDidChangeCellState.fire(e);
         }));
-        this._overlayContainer = document.createElement('div');
-        this.scopedContextKeyService = this._register(contextKeyService.createScoped(this._overlayContainer));
-        this.instantiationService = instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.scopedContextKeyService]))));
         this._register(_notebookService.onDidChangeOutputRenderers(() => {
             this._updateOutputRenderers();
         }));
@@ -1160,7 +1155,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
     }
     async _attachModel(textModel, 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 });
+        this.viewModel = this.instantiationService.createInstance(NotebookViewModel, textModel.viewType, textModel, this._viewContext, this.getLayoutInfo(), { isReadOnly: this._readOnly, inRepl: this._inRepl });
         this._viewContext.eventDispatcher.emit([( (new NotebookLayoutChangedEvent({ width: true, fontInfo: true }, this.getLayoutInfo())))]);
         this.notebookOptions.updateOptions(this._readOnly);
         this._updateForOptions();
@@ -1458,6 +1453,15 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             this.onWillHide();
             return;
         }
+        const whenContainerStylesLoaded = this.layoutService.whenContainerStylesLoaded(getWindow(this.getDomNode()));
+        if (whenContainerStylesLoaded) {
+            whenContainerStylesLoaded.then(() => this.layoutNotebook(dimension, shadowElement, position));
+        }
+        else {
+            this.layoutNotebook(dimension, shadowElement, position);
+        }
+    }
+    layoutNotebook(dimension, shadowElement, position) {
         if (shadowElement) {
             this.updateShadowElement(shadowElement, dimension, position);
         }
@@ -2032,7 +2036,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             ownerID = this.getId();
         }
         const findMatches = this._notebookViewModel.find(query, options).filter(match => match.length > 0);
-        if (!options.includeMarkupPreview && !options.includeOutput) {
+        if ((!options.includeMarkupPreview && !options.includeOutput) || options.findScope?.findScopeType === NotebookFindScopeType.Text) {
             this._webview?.findStop(ownerID);
             return findMatches;
         }
@@ -2048,10 +2052,12 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             if (token.isCancellationRequested) {
                 return [];
             }
-            const selectedRanges = options.selectedRanges?.map(range => this._notebookViewModel?.validateRange(range)).filter(range => !!range);
-            const selectedIndexes = cellRangesToIndexes(selectedRanges ?? []);
-            const findIds = ( (selectedIndexes.map(index => this._notebookViewModel?.viewCells[index].id ?? '')));
-            const webviewMatches = await this._webview.find(query, { caseSensitive: options.caseSensitive, wholeWord: options.wholeWord, includeMarkup: !!options.includeMarkupPreview, includeOutput: !!options.includeOutput, shouldGetSearchPreviewInfo, ownerID, findIds: options.searchInRanges ? findIds : [] });
+            let findIds = [];
+            if (options.findScope && options.findScope.findScopeType === NotebookFindScopeType.Cells && options.findScope.selectedCellRanges) {
+                const selectedIndexes = cellRangesToIndexes(options.findScope.selectedCellRanges);
+                findIds = ( (selectedIndexes.map(index => this._notebookViewModel?.viewCells[index].id ?? '')));
+            }
+            const webviewMatches = await this._webview.find(query, { caseSensitive: options.caseSensitive, wholeWord: options.wholeWord, includeMarkup: !!options.includeMarkupPreview, includeOutput: !!options.includeOutput, shouldGetSearchPreviewInfo, ownerID, findIds: findIds });
             if (token.isCancellationRequested) {
                 return [];
             }
@@ -2539,8 +2545,7 @@ NotebookEditorWidget = ( (__decorate([
     ( (__param(14, INotebookExecutionStateService))),
     ( (__param(15, IEditorProgressService))),
     ( (__param(16, INotebookLoggingService))),
-    ( (__param(17, IKeybindingService))),
-    ( (__param(18, ICodeEditorService)))
+    ( (__param(17, IKeybindingService)))
 ], NotebookEditorWidget)));
 registerZIndex(ZIndex.Base, 5, 'notebook-progress-bar');
 registerZIndex(ZIndex.Base, 10, 'notebook-list-insertion-indicator');
@@ -2562,76 +2567,36 @@ const notebookCellBorder = registerColor('notebook.cellBorderColor', {
     hcDark: PANEL_BORDER,
     hcLight: PANEL_BORDER
 }, ( localizeWithPath(_moduleId, 0, "The border color for notebook cells.")));
-registerColor('notebook.focusedEditorBorder', {
-    light: focusBorder,
-    dark: focusBorder,
-    hcDark: focusBorder,
-    hcLight: focusBorder
-}, ( localizeWithPath(_moduleId, 1, "The color of the notebook cell editor border.")));
-const cellStatusIconSuccess = registerColor('notebookStatusSuccessIcon.foreground', {
-    light: debugIconStartForeground,
-    dark: debugIconStartForeground,
-    hcDark: debugIconStartForeground,
-    hcLight: debugIconStartForeground
-}, ( localizeWithPath(
+registerColor('notebook.focusedEditorBorder', focusBorder, ( localizeWithPath(_moduleId, 1, "The color of the notebook cell editor border.")));
+const cellStatusIconSuccess = registerColor('notebookStatusSuccessIcon.foreground', debugIconStartForeground, ( localizeWithPath(
     _moduleId,
     2,
     "The error icon color of notebook cells in the cell status bar."
 )));
-const runningCellRulerDecorationColor = registerColor('notebookEditorOverviewRuler.runningCellForeground', {
-    light: debugIconStartForeground,
-    dark: debugIconStartForeground,
-    hcDark: debugIconStartForeground,
-    hcLight: debugIconStartForeground
-}, ( localizeWithPath(
+const runningCellRulerDecorationColor = registerColor('notebookEditorOverviewRuler.runningCellForeground', debugIconStartForeground, ( localizeWithPath(
     _moduleId,
     3,
     "The color of the running cell decoration in the notebook editor overview ruler."
 )));
-const cellStatusIconError = registerColor('notebookStatusErrorIcon.foreground', {
-    light: errorForeground,
-    dark: errorForeground,
-    hcDark: errorForeground,
-    hcLight: errorForeground
-}, ( localizeWithPath(
+const cellStatusIconError = registerColor('notebookStatusErrorIcon.foreground', errorForeground, ( localizeWithPath(
     _moduleId,
     4,
     "The error icon color of notebook cells in the cell status bar."
 )));
-registerColor('notebookStatusRunningIcon.foreground', {
-    light: foreground,
-    dark: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('notebookStatusRunningIcon.foreground', foreground, ( localizeWithPath(
     _moduleId,
     5,
     "The running icon color of notebook cells in the cell status bar."
 )));
-registerColor('notebook.outputContainerBorderColor', {
-    dark: null,
-    light: null,
-    hcDark: null,
-    hcLight: null
-}, ( localizeWithPath(_moduleId, 6, "The border color of the notebook output container.")));
-registerColor('notebook.outputContainerBackgroundColor', {
-    dark: null,
-    light: null,
-    hcDark: null,
-    hcLight: null
-}, ( localizeWithPath(_moduleId, 7, "The color of the notebook output container background.")));
+registerColor('notebook.outputContainerBorderColor', null, ( localizeWithPath(_moduleId, 6, "The border color of the notebook output container.")));
+registerColor('notebook.outputContainerBackgroundColor', null, ( localizeWithPath(_moduleId, 7, "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
 }, ( localizeWithPath(_moduleId, 8, "The color of the separator in the cell bottom toolbar")));
-const focusedCellBackground = registerColor('notebook.focusedCellBackground', {
-    dark: null,
-    light: null,
-    hcDark: null,
-    hcLight: null
-}, ( localizeWithPath(_moduleId, 9, "The background color of a cell when the cell is focused.")));
+const focusedCellBackground = registerColor('notebook.focusedCellBackground', null, ( localizeWithPath(_moduleId, 9, "The background color of a cell when the cell is focused.")));
 registerColor('notebook.selectedCellBackground', {
     dark: listInactiveSelectionBackground,
     light: listInactiveSelectionBackground,
@@ -2664,22 +2629,12 @@ registerColor('notebook.inactiveSelectedCellBorder', {
     13,
     "The color of the cell's borders when multiple cells are selected."
 )));
-registerColor('notebook.focusedCellBorder', {
-    dark: focusBorder,
-    light: focusBorder,
-    hcDark: focusBorder,
-    hcLight: focusBorder
-}, ( localizeWithPath(
+registerColor('notebook.focusedCellBorder', focusBorder, ( localizeWithPath(
     _moduleId,
     14,
     "The color of the cell's focus indicator borders when the cell is focused."
 )));
-registerColor('notebook.inactiveFocusedCellBorder', {
-    dark: notebookCellBorder,
-    light: notebookCellBorder,
-    hcDark: notebookCellBorder,
-    hcLight: notebookCellBorder
-}, ( localizeWithPath(
+registerColor('notebook.inactiveFocusedCellBorder', notebookCellBorder, ( localizeWithPath(
     _moduleId,
     15,
     "The color of the cell's top and bottom border when a cell is focused while the primary focus is outside of the editor."
@@ -2690,30 +2645,10 @@ registerColor('notebook.cellStatusBarItemHoverBackground', {
     hcDark: ( (new Color( (new RGBA(255, 255, 255, 0.15))))),
     hcLight: ( (new Color( (new RGBA(0, 0, 0, 0.08))))),
 }, ( localizeWithPath(_moduleId, 16, "The background color of notebook cell status bar items.")));
-registerColor('notebook.cellInsertionIndicator', {
-    light: focusBorder,
-    dark: focusBorder,
-    hcDark: focusBorder,
-    hcLight: focusBorder
-}, ( localizeWithPath(_moduleId, 17, "The color of the notebook cell insertion indicator.")));
-registerColor('notebookScrollbarSlider.background', {
-    dark: scrollbarSliderBackground,
-    light: scrollbarSliderBackground,
-    hcDark: scrollbarSliderBackground,
-    hcLight: scrollbarSliderBackground
-}, ( localizeWithPath(_moduleId, 18, "Notebook scrollbar slider background color.")));
-registerColor('notebookScrollbarSlider.hoverBackground', {
-    dark: scrollbarSliderHoverBackground,
-    light: scrollbarSliderHoverBackground,
-    hcDark: scrollbarSliderHoverBackground,
-    hcLight: scrollbarSliderHoverBackground
-}, ( localizeWithPath(_moduleId, 19, "Notebook scrollbar slider background color when hovering.")));
-registerColor('notebookScrollbarSlider.activeBackground', {
-    dark: scrollbarSliderActiveBackground,
-    light: scrollbarSliderActiveBackground,
-    hcDark: scrollbarSliderActiveBackground,
-    hcLight: scrollbarSliderActiveBackground
-}, ( localizeWithPath(
+registerColor('notebook.cellInsertionIndicator', focusBorder, ( localizeWithPath(_moduleId, 17, "The color of the notebook cell insertion indicator.")));
+registerColor('notebookScrollbarSlider.background', scrollbarSliderBackground, ( localizeWithPath(_moduleId, 18, "Notebook scrollbar slider background color.")));
+registerColor('notebookScrollbarSlider.hoverBackground', scrollbarSliderHoverBackground, ( localizeWithPath(_moduleId, 19, "Notebook scrollbar slider background color when hovering.")));
+registerColor('notebookScrollbarSlider.activeBackground', scrollbarSliderActiveBackground, ( localizeWithPath(
     _moduleId,
     20,
     "Notebook scrollbar slider background color when clicked on."

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

@@ -4,29 +4,30 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 const _moduleId = "vs/workbench/contrib/notebook/browser/notebookIcons";
 const selectKernelIcon = registerIcon('notebook-kernel-select', Codicon.serverEnvironment, ( localizeWithPath(_moduleId, 0, 'Configure icon to select a kernel in notebook editors.')));
 const executeIcon = registerIcon('notebook-execute', Codicon.play, ( localizeWithPath(_moduleId, 1, 'Icon to execute in notebook editors.')));
-const executeAboveIcon = registerIcon('notebook-execute-above', Codicon.runAbove, ( localizeWithPath(_moduleId, 2, 'Icon to execute above cells in notebook editors.')));
-const executeBelowIcon = registerIcon('notebook-execute-below', Codicon.runBelow, ( localizeWithPath(_moduleId, 3, 'Icon to execute below cells in notebook editors.')));
-const stopIcon = registerIcon('notebook-stop', Codicon.primitiveSquare, ( localizeWithPath(_moduleId, 4, 'Icon to stop an execution in notebook editors.')));
-const deleteCellIcon = registerIcon('notebook-delete-cell', Codicon.trash, ( localizeWithPath(_moduleId, 5, 'Icon to delete a cell in notebook editors.')));
-const executeAllIcon = registerIcon('notebook-execute-all', Codicon.runAll, ( localizeWithPath(_moduleId, 6, 'Icon to execute all cells in notebook editors.')));
-const editIcon = registerIcon('notebook-edit', Codicon.pencil, ( localizeWithPath(_moduleId, 7, 'Icon to edit a cell in notebook editors.')));
-const stopEditIcon = registerIcon('notebook-stop-edit', Codicon.check, ( localizeWithPath(_moduleId, 8, 'Icon to stop editing a cell in notebook editors.')));
-const moveUpIcon = registerIcon('notebook-move-up', Codicon.arrowUp, ( localizeWithPath(_moduleId, 9, 'Icon to move up a cell in notebook editors.')));
-const moveDownIcon = registerIcon('notebook-move-down', Codicon.arrowDown, ( localizeWithPath(_moduleId, 10, 'Icon to move down a cell in notebook editors.')));
-const clearIcon = registerIcon('notebook-clear', Codicon.clearAll, ( localizeWithPath(_moduleId, 11, 'Icon to clear cell outputs in notebook editors.')));
-const splitCellIcon = registerIcon('notebook-split-cell', Codicon.splitVertical, ( localizeWithPath(_moduleId, 12, 'Icon to split a cell in notebook editors.')));
-const successStateIcon = registerIcon('notebook-state-success', Codicon.check, ( localizeWithPath(_moduleId, 13, 'Icon to indicate a success state in notebook editors.')));
-const errorStateIcon = registerIcon('notebook-state-error', Codicon.error, ( localizeWithPath(_moduleId, 14, 'Icon to indicate an error state in notebook editors.')));
-const pendingStateIcon = registerIcon('notebook-state-pending', Codicon.clock, ( localizeWithPath(_moduleId, 15, 'Icon to indicate a pending state in notebook editors.')));
-const executingStateIcon = registerIcon('notebook-state-executing', Codicon.sync, ( localizeWithPath(_moduleId, 16, 'Icon to indicate an executing state in notebook editors.')));
-const collapsedIcon = registerIcon('notebook-collapsed', Codicon.chevronRight, ( localizeWithPath(_moduleId, 17, 'Icon to annotate a collapsed section in notebook editors.')));
-const expandedIcon = registerIcon('notebook-expanded', Codicon.chevronDown, ( localizeWithPath(_moduleId, 18, 'Icon to annotate an expanded section in notebook editors.')));
-const openAsTextIcon = registerIcon('notebook-open-as-text', Codicon.fileCode, ( localizeWithPath(_moduleId, 19, 'Icon to open the notebook in a text editor.')));
-const revertIcon = registerIcon('notebook-revert', Codicon.discard, ( localizeWithPath(_moduleId, 20, 'Icon to revert in notebook editors.')));
-const renderOutputIcon = registerIcon('notebook-render-output', Codicon.preview, ( localizeWithPath(_moduleId, 21, 'Icon to render output in diff editor.')));
-const mimetypeIcon = registerIcon('notebook-mimetype', Codicon.code, ( localizeWithPath(_moduleId, 22, 'Icon for a mime type in notebook editors.')));
-const copyIcon = registerIcon('notebook-copy', Codicon.copy, ( localizeWithPath(_moduleId, 23, 'Icon to copy content to clipboard')));
-const previousChangeIcon = registerIcon('notebook-diff-editor-previous-change', Codicon.arrowUp, ( localizeWithPath(_moduleId, 24, 'Icon for the previous change action in the diff editor.')));
-const nextChangeIcon = registerIcon('notebook-diff-editor-next-change', Codicon.arrowDown, ( localizeWithPath(_moduleId, 25, 'Icon for the next change action in the diff editor.')));
-const variablesViewIcon = registerIcon('variables-view-icon', Codicon.debugAlt, ( localizeWithPath(_moduleId, 26, '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, variablesViewIcon };
+const configIcon = registerIcon('notebook-config', Codicon.gear, ( localizeWithPath(_moduleId, 2, 'Icon to configure in notebook editors.')));
+const executeAboveIcon = registerIcon('notebook-execute-above', Codicon.runAbove, ( localizeWithPath(_moduleId, 3, 'Icon to execute above cells in notebook editors.')));
+const executeBelowIcon = registerIcon('notebook-execute-below', Codicon.runBelow, ( localizeWithPath(_moduleId, 4, 'Icon to execute below cells in notebook editors.')));
+const stopIcon = registerIcon('notebook-stop', Codicon.primitiveSquare, ( localizeWithPath(_moduleId, 5, 'Icon to stop an execution in notebook editors.')));
+const deleteCellIcon = registerIcon('notebook-delete-cell', Codicon.trash, ( localizeWithPath(_moduleId, 6, 'Icon to delete a cell in notebook editors.')));
+const executeAllIcon = registerIcon('notebook-execute-all', Codicon.runAll, ( localizeWithPath(_moduleId, 7, 'Icon to execute all cells in notebook editors.')));
+const editIcon = registerIcon('notebook-edit', Codicon.pencil, ( localizeWithPath(_moduleId, 8, 'Icon to edit a cell in notebook editors.')));
+const stopEditIcon = registerIcon('notebook-stop-edit', Codicon.check, ( localizeWithPath(_moduleId, 9, 'Icon to stop editing a cell in notebook editors.')));
+const moveUpIcon = registerIcon('notebook-move-up', Codicon.arrowUp, ( localizeWithPath(_moduleId, 10, 'Icon to move up a cell in notebook editors.')));
+const moveDownIcon = registerIcon('notebook-move-down', Codicon.arrowDown, ( localizeWithPath(_moduleId, 11, 'Icon to move down a cell in notebook editors.')));
+const clearIcon = registerIcon('notebook-clear', Codicon.clearAll, ( localizeWithPath(_moduleId, 12, 'Icon to clear cell outputs in notebook editors.')));
+const splitCellIcon = registerIcon('notebook-split-cell', Codicon.splitVertical, ( localizeWithPath(_moduleId, 13, 'Icon to split a cell in notebook editors.')));
+const successStateIcon = registerIcon('notebook-state-success', Codicon.check, ( localizeWithPath(_moduleId, 14, 'Icon to indicate a success state in notebook editors.')));
+const errorStateIcon = registerIcon('notebook-state-error', Codicon.error, ( localizeWithPath(_moduleId, 15, 'Icon to indicate an error state in notebook editors.')));
+const pendingStateIcon = registerIcon('notebook-state-pending', Codicon.clock, ( localizeWithPath(_moduleId, 16, 'Icon to indicate a pending state in notebook editors.')));
+const executingStateIcon = registerIcon('notebook-state-executing', Codicon.sync, ( localizeWithPath(_moduleId, 17, 'Icon to indicate an executing state in notebook editors.')));
+const collapsedIcon = registerIcon('notebook-collapsed', Codicon.chevronRight, ( localizeWithPath(_moduleId, 18, 'Icon to annotate a collapsed section in notebook editors.')));
+const expandedIcon = registerIcon('notebook-expanded', Codicon.chevronDown, ( localizeWithPath(_moduleId, 19, 'Icon to annotate an expanded section in notebook editors.')));
+const openAsTextIcon = registerIcon('notebook-open-as-text', Codicon.fileCode, ( localizeWithPath(_moduleId, 20, 'Icon to open the notebook in a text editor.')));
+const revertIcon = registerIcon('notebook-revert', Codicon.discard, ( localizeWithPath(_moduleId, 21, 'Icon to revert in notebook editors.')));
+const renderOutputIcon = registerIcon('notebook-render-output', Codicon.preview, ( localizeWithPath(_moduleId, 22, 'Icon to render output in diff editor.')));
+const mimetypeIcon = registerIcon('notebook-mimetype', Codicon.code, ( localizeWithPath(_moduleId, 23, 'Icon for a mime type in notebook editors.')));
+const copyIcon = registerIcon('notebook-copy', Codicon.copy, ( localizeWithPath(_moduleId, 24, 'Icon to copy content to clipboard')));
+const previousChangeIcon = registerIcon('notebook-diff-editor-previous-change', Codicon.arrowUp, ( localizeWithPath(_moduleId, 25, 'Icon for the previous change action in the diff editor.')));
+const nextChangeIcon = registerIcon('notebook-diff-editor-next-change', Codicon.arrowDown, ( localizeWithPath(_moduleId, 26, 'Icon for the next change action in the diff editor.')));
+const variablesViewIcon = registerIcon('variables-view-icon', Codicon.debugAlt, ( localizeWithPath(_moduleId, 27, 'View icon of the variables view.')));
+export { clearIcon, collapsedIcon, configIcon, copyIcon, deleteCellIcon, editIcon, errorStateIcon, executeAboveIcon, executeAllIcon, executeBelowIcon, executeIcon, executingStateIcon, expandedIcon, mimetypeIcon, moveDownIcon, moveUpIcon, nextChangeIcon, openAsTextIcon, pendingStateIcon, previousChangeIcon, renderOutputIcon, revertIcon, selectKernelIcon, splitCellIcon, stopEditIcon, stopIcon, successStateIcon, variablesViewIcon };

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

@@ -1,11 +1,15 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 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';
 const SCROLLABLE_ELEMENT_PADDING_TOP = 18;
 const OutputInnerContainerTopPadding = 4;
 const defaultConfigConstants = ( Object.freeze({
@@ -26,15 +30,15 @@ const compactConfigConstants = ( Object.freeze({
     markdownCellGutter: 36,
     focusIndicatorLeftMargin: 4
 }));
-class NotebookOptions extends Disposable {
-    constructor(targetWindow, configurationService, notebookExecutionStateService, codeEditorService, isReadonly, overrides) {
+let NotebookOptions = class NotebookOptions extends Disposable {
+    constructor(targetWindow, isReadonly, overrides, configurationService, notebookExecutionStateService, codeEditorService) {
         super();
         this.targetWindow = targetWindow;
+        this.isReadonly = isReadonly;
+        this.overrides = overrides;
         this.configurationService = configurationService;
         this.notebookExecutionStateService = notebookExecutionStateService;
         this.codeEditorService = codeEditorService;
-        this.isReadonly = isReadonly;
-        this.overrides = overrides;
         this._onDidChangeOptions = this._register(( new Emitter()));
         this.onDidChangeOptions = this._onDidChangeOptions.event;
         this._editorTopPadding = 12;
@@ -633,5 +637,10 @@ class NotebookOptions extends Disposable {
             verticalIndicatorHeight: totalHeight - bottomToolbarGap - foldHintHeight
         };
     }
-}
+};
+NotebookOptions = ( __decorate([
+    ( __param(3, IConfigurationService)),
+    ( __param(4, INotebookExecutionStateService)),
+    ( __param(5, ICodeEditorService))
+], NotebookOptions));
 export { NotebookOptions, OutputInnerContainerTopPadding };

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

@@ -47,7 +47,7 @@ let UnifiedSubmenuActionView = class UnifiedSubmenuActionView extends SubmenuEnt
         container.classList.add('notebook-action-view-item-unified');
         this._actionLabel = document.createElement('a');
         container.appendChild(this._actionLabel);
-        this._hover = this._register(this._hoverService.setupUpdatableHover(this.options.hoverDelegate ?? getDefaultHoverDelegate('element'), this._actionLabel, ''));
+        this._hover = this._register(this._hoverService.setupManagedHover(this.options.hoverDelegate ?? getDefaultHoverDelegate('element'), this._actionLabel, ''));
         this.updateLabel();
         for (const event of [EventType.CLICK, EventType.MOUSE_DOWN, EventType$1.Tap]) {
             this._register(addDisposableListener(container, event, e => this.onClick(e, true)));

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 } from '../../../../../../base/common/lifecycle.js';
+import { DisposableStore, MutableDisposable } 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';
@@ -20,27 +20,22 @@ let CellComments = class CellComments extends CellContentPart {
         this.commentService = commentService;
         this.configurationService = configurationService;
         this.instantiationService = instantiationService;
-        this._initialized = false;
-        this._commentThreadWidget = null;
-        this.commentTheadDisposables = this._register(( new DisposableStore()));
+        this._commentThreadDisposables = this._register(( new DisposableStore()));
         this.container.classList.add('review-widget');
+        this._register(this._commentThreadWidget = ( new MutableDisposable()));
         this._register(this.themeService.onDidColorThemeChange(this._applyTheme, this));
         this._applyTheme();
     }
     async initialize(element) {
-        if (this._initialized) {
+        if (this.currentElement === element) {
             return;
         }
-        this._initialized = true;
-        const info = await this._getCommentThreadForCell(element);
-        if (info) {
-            await this._createCommentTheadWidget(info.owner, info.thread);
-        }
+        this.currentElement = element;
+        await this._updateThread();
     }
     async _createCommentTheadWidget(owner, commentThread) {
-        this._commentThreadWidget?.dispose();
-        this.commentTheadDisposables.clear();
-        this._commentThreadWidget = this.instantiationService.createInstance(CommentThreadWidget, this.container, this.notebookEditor, owner, this.notebookEditor.textModel.uri, this.contextKeyService, this.instantiationService, commentThread, undefined, undefined, {
+        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, {
             codeBlockFontFamily: this.configurationService.getValue('editor').fontFamily || EDITOR_FONT_DEFAULTS.fontFamily
         }, undefined, {
             actionRunner: () => {
@@ -48,40 +43,43 @@ let CellComments = class CellComments extends CellContentPart {
             collapse: () => { }
         });
         const layoutInfo = this.notebookEditor.getLayoutInfo();
-        await this._commentThreadWidget.display(layoutInfo.fontInfo.lineHeight, true);
+        await this._commentThreadWidget.value.display(layoutInfo.fontInfo.lineHeight, true);
         this._applyTheme();
-        this.commentTheadDisposables.add(this._commentThreadWidget.onDidResize(() => {
-            if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget) {
-                this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.getDimensions().height);
+        this._commentThreadDisposables.add(this._commentThreadWidget.value.onDidResize(() => {
+            if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget.value) {
+                this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.value.getDimensions().height);
             }
         }));
     }
     _bindListeners() {
-        this.cellDisposables.add(this.commentService.onDidUpdateCommentThreads(async () => {
-            if (this.currentElement) {
-                const info = await this._getCommentThreadForCell(this.currentElement);
-                if (!this._commentThreadWidget && info) {
-                    await this._createCommentTheadWidget(info.owner, info.thread);
-                    const layoutInfo = this.currentElement.layoutInfo;
-                    this.container.style.top = `${layoutInfo.outputContainerOffset + layoutInfo.outputTotalHeight}px`;
-                    this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.getDimensions().height);
-                    return;
-                }
-                if (this._commentThreadWidget) {
-                    if (!info) {
-                        this._commentThreadWidget.dispose();
-                        this.currentElement.commentHeight = 0;
-                        return;
-                    }
-                    if (this._commentThreadWidget.commentThread === info.thread) {
-                        this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.getDimensions().height);
-                        return;
-                    }
-                    await this._commentThreadWidget.updateCommentThread(info.thread);
-                    this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.getDimensions().height);
-                }
+        this.cellDisposables.add(this.commentService.onDidUpdateCommentThreads(async () => this._updateThread()));
+    }
+    async _updateThread() {
+        if (!this.currentElement) {
+            return;
+        }
+        const info = await this._getCommentThreadForCell(this.currentElement);
+        if (!this._commentThreadWidget.value && info) {
+            await this._createCommentTheadWidget(info.owner, info.thread);
+            const layoutInfo = this.currentElement.layoutInfo;
+            this.container.style.top = `${layoutInfo.outputContainerOffset + layoutInfo.outputTotalHeight}px`;
+            this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.value.getDimensions().height);
+            return;
+        }
+        if (this._commentThreadWidget.value) {
+            if (!info) {
+                this._commentThreadDisposables.clear();
+                this._commentThreadWidget.value = undefined;
+                this.currentElement.commentHeight = 0;
+                return;
             }
-        }));
+            if (this._commentThreadWidget.value.commentThread === info.thread) {
+                this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.value.getDimensions().height);
+                return;
+            }
+            await this._commentThreadWidget.value.updateCommentThread(info.thread);
+            this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.value.getDimensions().height);
+        }
     }
     _calculateCommentThreadHeight(bodyHeight) {
         const layoutInfo = this.notebookEditor.getLayoutInfo();
@@ -104,22 +102,21 @@ let CellComments = class CellComments extends CellContentPart {
     _applyTheme() {
         const theme = this.themeService.getColorTheme();
         const fontInfo = this.notebookEditor.getLayoutInfo().fontInfo;
-        this._commentThreadWidget?.applyTheme(theme, fontInfo);
+        this._commentThreadWidget.value?.applyTheme(theme, fontInfo);
     }
     didRenderCell(element) {
         if (element.cellKind === CellKind.Code) {
-            this.currentElement = element;
             this.initialize(element);
             this._bindListeners();
         }
     }
     prepareLayout() {
-        if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget) {
-            this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.getDimensions().height);
+        if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget.value) {
+            this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.value.getDimensions().height);
         }
     }
     updateInternalLayoutNow(element) {
-        if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget) {
+        if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget.value) {
             const layoutInfo = element.layoutInfo;
             this.container.style.top = `${layoutInfo.outputContainerOffset + layoutInfo.outputTotalHeight}px`;
         }

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

@@ -252,7 +252,7 @@ class CellDragAndDropController extends Disposable {
             const dragImage = dragImageProvider();
             cellRoot.parentElement.appendChild(dragImage);
             event.dataTransfer.setDragImage(dragImage, 0, 0);
-            setTimeout(() => cellRoot.parentElement.removeChild(dragImage), 0);
+            setTimeout(() => dragImage.remove(), 0);
         };
         for (const dragHandle of dragHandles) {
             templateData.templateDisposables.add(addDisposableListener(dragHandle, EventType.DRAG_START, onDragStart));

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

@@ -51,7 +51,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         }));
     }
     detach() {
-        this.renderedOutputContainer?.parentElement?.removeChild(this.renderedOutputContainer);
+        this.renderedOutputContainer?.remove();
         let count = 0;
         if (this.innerContainer) {
             for (let i = 0; i < this.innerContainer.childNodes.length; i++) {
@@ -63,7 +63,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
                 }
             }
             if (count === 0) {
-                this.innerContainer.parentElement?.removeChild(this.innerContainer);
+                this.innerContainer.remove();
             }
         }
         this.notebookEditor.removeInset(this.output);
@@ -98,7 +98,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             this._renderDisposableStore.clear();
             const element = this.innerContainer;
             if (element) {
-                element.parentElement?.removeChild(element);
+                element.remove();
                 this.notebookEditor.removeInset(this.output);
             }
             this.render(nextElement);
@@ -294,7 +294,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         this._renderDisposableStore.clear();
         const element = this.innerContainer;
         if (element) {
-            element.parentElement?.removeChild(element);
+            element.remove();
             this.notebookEditor.removeInset(viewModel);
         }
         viewModel.pickedMimeType = mimeTypes[pick.index];

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

@@ -87,12 +87,15 @@ let CellEditorStatusBar = class CellEditorStatusBar extends CellContentPart {
         }));
     }
     didRenderCell(element) {
-        this.updateContext({
-            ui: true,
-            cell: element,
-            notebookEditor: this._notebookEditor,
-            $mid: MarshalledId.NotebookCellActionContext
-        });
+        if (this._notebookEditor.hasModel()) {
+            const context = {
+                ui: true,
+                cell: element,
+                notebookEditor: this._notebookEditor,
+                $mid: MarshalledId.NotebookCellActionContext
+            };
+            this.updateContext(context);
+        }
         if (this._editor) {
             const updateFocusModeForEditorEvent = () => {
                 if (this._editor && (this._editor.hasWidgetFocus() || (this.statusBarContainer.ownerDocument.activeElement && this.statusBarContainer.contains(this.statusBarContainer.ownerDocument.activeElement)))) {
@@ -180,7 +183,7 @@ let CellEditorStatusBar = class CellEditorStatusBar extends CellContentPart {
             if (renderedItems.length > newItems.length) {
                 const deleted = renderedItems.splice(newItems.length, renderedItems.length - newItems.length);
                 for (const deletedItem of deleted) {
-                    container.removeChild(deletedItem.container);
+                    deletedItem.container.remove();
                     deletedItem.dispose();
                 }
             }
@@ -258,8 +261,8 @@ let CellStatusBarItem = class CellStatusBarItem extends Disposable {
         this.container.setAttribute('aria-label', ariaLabel);
         this.container.setAttribute('role', role || '');
         if (item.tooltip) {
-            const hoverContent = typeof item.tooltip === 'string' ? item.tooltip : { markdown: item.tooltip };
-            this._itemDisposables.add(this._hoverService.setupUpdatableHover(this._hoverDelegate, this.container, hoverContent));
+            const hoverContent = typeof item.tooltip === 'string' ? item.tooltip : { markdown: item.tooltip, markdownNotSupportedFallback: undefined };
+            this._itemDisposables.add(this._hoverService.setupManagedHover(this._hoverDelegate, this.container, hoverContent));
         }
         this.container.classList.toggle('cell-status-item-has-command', !!item.command);
         if (item.command) {