@codingame/monaco-vscode-api 9.0.3 → 10.0.1

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

@@ -2,9 +2,7 @@ import { $, reset } from '../../../../../../base/browser/dom.js';
 import { createTrustedTypesPolicy } from '../../../../../../base/browser/trustedTypes.js';
 import { Color } from '../../../../../../base/common/color.js';
 import { isWindows } from '../../../../../../base/common/platform.js';
-import { EditorOption } from '../../../../../../editor/common/config/editorOptions.js';
 import { Range } from '../../../../../../editor/common/core/range.js';
-import { ColorId } from '../../../../../../editor/common/encodedTokenAttributes.js';
 import { TokenizationRegistry } from '../../../../../../editor/common/languages.js';
 import { tokenizeLineToHTML } from '../../../../../../editor/common/languages/textToHtmlTokenizer.js';
 class EditorTextRenderer {
@@ -17,13 +15,13 @@ class EditorTextRenderer {
             return null;
         }
         const colorMap = this.getDefaultColorMap();
-        const fontInfo = editor.getOptions().get(EditorOption.fontInfo);
+        const fontInfo = editor.getOptions().get(52 );
         const fontFamilyVar = '--notebook-editor-font-family';
         const fontSizeVar = '--notebook-editor-font-size';
         const fontWeightVar = '--notebook-editor-font-weight';
         const style = ``
-            + `color: ${colorMap[ColorId.DefaultForeground]};`
-            + `background-color: ${colorMap[ColorId.DefaultBackground]};`
+            + `color: ${colorMap[1 ]};`
+            + `background-color: ${colorMap[2 ]};`
             + `font-family: var(${fontFamilyVar});`
             + `font-weight: var(${fontWeightVar});`
             + `font-size: var(${fontSizeVar});`

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

@@ -141,7 +141,7 @@ class CellEditorOptions extends CellContentPart {
             type: 'string',
             enum: ['off', 'on'],
             default: 'off',
-            markdownDescription: ( localize(10779, "Controls the display of line numbers in the cell editor."))
+            markdownDescription: ( localize(10910, "Controls the display of line numbers in the cell editor."))
         }
     }
 });
@@ -149,7 +149,7 @@ registerAction2(class ToggleLineNumberAction extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggleLineNumbers',
-            title: ( localize2(10780, 'Toggle Notebook Line Numbers')),
+            title: ( localize2(10911, 'Toggle Notebook Line Numbers')),
             precondition: NOTEBOOK_EDITOR_FOCUSED,
             menu: [
                 {
@@ -163,7 +163,7 @@ registerAction2(class ToggleLineNumberAction extends Action2 {
             f1: true,
             toggled: {
                 condition: ( (ContextKeyExpr.notEquals('config.notebook.lineNumbers', 'off'))),
-                title: ( localize(10781, "Notebook Line Numbers")),
+                title: ( localize(10912, "Notebook Line Numbers")),
             }
         });
     }
@@ -182,7 +182,7 @@ registerAction2(class ToggleActiveLineNumberAction extends NotebookMultiCellActi
     constructor() {
         super({
             id: 'notebook.cell.toggleLineNumbers',
-            title: ( localize(10782, "Show Cell Line Numbers")),
+            title: ( localize(10913, "Show Cell Line Numbers")),
             precondition: ( (ActiveEditorContext.isEqualTo(NOTEBOOK_EDITOR_ID))),
             menu: [{
                     id: MenuId.NotebookCellTitle,

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

@@ -3,7 +3,6 @@ import { show, hide, $, append } from '../../../../../../base/browser/dom.js';
 import { renderMarkdown } from '../../../../../../base/browser/markdownRenderer.js';
 import { Action } from '../../../../../../base/common/actions.js';
 import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
-import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
 import { localize } from '../../../../../../nls.js';
 import { createAndFillInActionBarActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { WorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
@@ -14,26 +13,25 @@ import { IInstantiationService } from '../../../../../../platform/instantiation/
 import { IOpenerService } from '../../../../../../platform/opener/common/opener.service.js';
 import { IQuickInputService } from '../../../../../../platform/quickinput/common/quickInput.service.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
-import { ViewContainerLocation } from '../../../../../common/views.js';
-import { VIEWLET_ID } from '../../../../extensions/common/extensions.js';
-import { RenderOutputType, JUPYTER_EXTENSION_ID } from '../../notebookBrowser.js';
+import { IExtensionsWorkbenchService } from '../../../../extensions/common/extensions.service.js';
+import { JUPYTER_EXTENSION_ID } from '../../notebookBrowser.js';
 import { mimetypeIcon } from '../../notebookIcons.js';
 import { CellContentPart } from '../cellPart.js';
 import { NotebookCellExecutionState, CellUri, isTextStreamMime, RENDERER_NOT_AVAILABLE } from '../../../common/notebookCommon.js';
 import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
 import { INotebookService } from '../../../common/notebookService.service.js';
-import { IPaneCompositePartService } from '../../../../../services/panecomposite/browser/panecomposite.service.js';
 import { COPY_OUTPUT_COMMAND_ID } from '../../controller/cellOutputActions.js';
 import { TEXT_BASED_MIMETYPES } from '../../contrib/clipboard/cellOutputClipboard.js';
 import { observableValue } from '../../../../../../base/common/observableInternal/base.js';
-import '../../../../../../base/common/observableInternal/derived.js';
+import '../../../../../../base/common/arrays.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/arrays.js';
+import '../../../../../../base/common/observableInternal/utils.js';
 import { NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS, NOTEBOOK_CELL_IS_FIRST_OUTPUT } from '../../../common/notebookContextKeys.js';
 let CellOutputElement = class CellOutputElement extends Disposable {
-    constructor(notebookEditor, viewCell, cellOutputContainer, outputContainer, output, notebookService, quickInputService, parentContextKeyService, menuService, paneCompositeService, instantiationService) {
+    constructor(notebookEditor, viewCell, cellOutputContainer, outputContainer, output, notebookService, quickInputService, parentContextKeyService, menuService, extensionsWorkbenchService, instantiationService) {
         super();
         this.notebookEditor = notebookEditor;
         this.viewCell = viewCell;
@@ -43,7 +41,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         this.notebookService = notebookService;
         this.quickInputService = quickInputService;
         this.menuService = menuService;
-        this.paneCompositeService = paneCompositeService;
+        this.extensionsWorkbenchService = extensionsWorkbenchService;
         this.instantiationService = instantiationService;
         this.toolbarDisposables = this._register(( (new DisposableStore())));
         this.toolbarAttached = false;
@@ -83,7 +81,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         if (this.notebookEditor.hasModel() &&
             this.innerContainer &&
             this.renderResult &&
-            this.renderResult.type === RenderOutputType.Extension) {
+            this.renderResult.type === 1 ) {
             const [mimeTypes, pick] = this.output.resolveMimeTypes(this.notebookEditor.textModel, this.notebookEditor.activeKernel?.preloadProvides);
             const pickedMimeType = mimeTypes[pick];
             if (pickedMimeType.mimeType === this.renderResult.mimeType && pickedMimeType.rendererId === this.renderResult.renderer.id) {
@@ -162,7 +160,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         }
         this.renderedOutputContainer = append(innerContainer, $('.rendered-output'));
         this.renderResult = renderer
-            ? { type: RenderOutputType.Extension, renderer, source: this.output, mimeType: selectedPresentation.mimeType }
+            ? { type: 1 , renderer, source: this.output, mimeType: selectedPresentation.mimeType }
             : this._renderMissingRenderer(this.output, selectedPresentation.mimeType);
         this.output.pickedMimeType = selectedPresentation;
         if (!this.renderResult) {
@@ -175,13 +173,13 @@ let CellOutputElement = class CellOutputElement extends Disposable {
     }
     _renderMissingRenderer(viewModel, preferredMimeType) {
         if (!viewModel.model.outputs.length) {
-            return this._renderMessage(viewModel, ( localize(11582, "Cell has no output")));
+            return this._renderMessage(viewModel, ( localize(11725, "Cell has no output")));
         }
         if (!preferredMimeType) {
             const mimeTypes = ( (viewModel.model.outputs.map(op => op.mime)));
             const mimeTypesMessage = mimeTypes.join(', ');
             return this._renderMessage(viewModel, ( localize(
-                11583,
+                11726,
                 "No renderer could be found for output. It has the following mimetypes: {0}",
                 mimeTypesMessage
             )));
@@ -193,14 +191,14 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         const p = $('p', undefined, `No renderer could be found for mimetype "${mimeType}", but one might be available on the Marketplace.`);
         const a = $('a', { href: `command:workbench.extensions.search?%22${query}%22`, class: 'monaco-button monaco-text-button', tabindex: 0, role: 'button', style: 'padding: 8px; text-decoration: none; color: rgb(255, 255, 255); background-color: rgb(14, 99, 156); max-width: 200px;' }, `Search Marketplace`);
         return {
-            type: RenderOutputType.Html,
+            type: 0 ,
             source: viewModel,
             htmlContent: p.outerHTML + a.outerHTML
         };
     }
     _renderMessage(viewModel, message) {
         const el = $('p', undefined, message);
-        return { type: RenderOutputType.Html, source: viewModel, htmlContent: el.outerHTML };
+        return { type: 0 , source: viewModel, htmlContent: el.outerHTML };
     }
     shouldEnableCopy(mimeTypes) {
         if (!mimeTypes.find(mimeType => TEXT_BASED_MIMETYPES.indexOf(mimeType.mimeType) || mimeType.mimeType.startsWith('image/'))) {
@@ -236,9 +234,9 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             cell: this.output.cellViewModel,
             outputViewModel: this.output,
             notebookEditor: this.notebookEditor,
-            $mid: MarshalledId.NotebookCellActionContext
+            $mid: 13
         };
-        const pickAction = this.toolbarDisposables.add(( (new Action('notebook.output.pickMimetype', ( localize(11584, "Change Presentation")), ThemeIcon.asClassName(mimetypeIcon), undefined, async (_context) => this._pickActiveMimeTypeRenderer(outputItemDiv, notebookTextModel, kernel, this.output)))));
+        const pickAction = this.toolbarDisposables.add(( (new Action('notebook.output.pickMimetype', ( localize(11727, "Change Presentation")), ThemeIcon.asClassName(mimetypeIcon), undefined, async (_context) => this._pickActiveMimeTypeRenderer(outputItemDiv, notebookTextModel, kernel, this.output)))));
         const menuContextKeyService = this.toolbarDisposables.add(this.contextKeyService.createScoped(outputItemDiv));
         const hasHiddenOutputs = NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS.bindTo(menuContextKeyService);
         const isFirstCellOutput = NOTEBOOK_CELL_IS_FIRST_OUTPUT.bindTo(menuContextKeyService);
@@ -276,13 +274,13 @@ let CellOutputElement = class CellOutputElement extends Disposable {
                     index: index,
                     picked: index === currIndex,
                     detail: this._generateRendererInfo(mimeType.rendererId),
-                    description: index === currIndex ? ( localize(11585, "Currently Active")) : undefined
+                    description: index === currIndex ? ( localize(11728, "Currently Active")) : undefined
                 });
             }
         });
         if (( (unsupportedItems.some(m => JUPYTER_RENDERER_MIMETYPES.includes(m.id))))) {
             unsupportedItems.push({
-                label: ( localize(11586, "Install additional renderers from the marketplace")),
+                label: ( localize(11729, "Install additional renderers from the marketplace")),
                 id: 'installRenderers',
                 index: mimeTypes.length
             });
@@ -296,8 +294,8 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         ];
         picker.activeItems = items.filter(item => !!item.picked);
         picker.placeholder = items.length !== mimeTypes.length
-            ? ( localize(11587, "Select mimetype to render for current output"))
-            : ( localize(11588, "Select mimetype to render for current output"));
+            ? ( localize(11730, "Select mimetype to render for current output"))
+            : ( localize(11731, "Select mimetype to render for current output"));
         const pick = await ( (new Promise(resolve => {
             disposables.add(picker.onDidAccept(() => {
                 resolve(picker.selectedItems.length === 1 ? picker.selectedItems[0] : undefined);
@@ -328,9 +326,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         this._relayoutCell();
     }
     async _showJupyterExtension() {
-        const viewlet = await this.paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
-        const view = viewlet?.getViewPaneContainer();
-        view?.search(`@id:${JUPYTER_EXTENSION_ID}`);
+        await this.extensionsWorkbenchService.openSearch(`@id:${JUPYTER_EXTENSION_ID}`);
     }
     _generateRendererInfo(renderId) {
         const renderInfo = this.notebookService.getRendererInfo(renderId);
@@ -338,7 +334,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             const displayName = renderInfo.displayName !== '' ? renderInfo.displayName : renderInfo.id;
             return `${displayName} (${renderInfo.extensionId.value})`;
         }
-        return ( localize(11589, "renderer not available"));
+        return ( localize(11732, "renderer not available"));
     }
     _validateFinalOutputHeight(synchronous) {
         if (this._outputHeightTimer !== null) {
@@ -369,7 +365,7 @@ CellOutputElement = ( (__decorate([
     ( (__param(6, IQuickInputService))),
     ( (__param(7, IContextKeyService))),
     ( (__param(8, IMenuService))),
-    ( (__param(9, IPaneCompositePartService))),
+    ( (__param(9, IExtensionsWorkbenchService))),
     ( (__param(10, IInstantiationService)))
 ], CellOutputElement)));
 class OutputEntryViewHandler {
@@ -378,11 +374,6 @@ class OutputEntryViewHandler {
         this.element = element;
     }
 }
-var CellOutputUpdateContext;
-( ((function(CellOutputUpdateContext) {
-    CellOutputUpdateContext[CellOutputUpdateContext["Execution"] = 1] = "Execution";
-    CellOutputUpdateContext[CellOutputUpdateContext["Other"] = 2] = "Other";
-})(CellOutputUpdateContext || (CellOutputUpdateContext = {}))));
 let CellOutputContainer = class CellOutputContainer extends CellContentPart {
     checkForHiddenOutputs() {
         if (this._outputEntries.find(entry => { return entry.model.visible; })) {
@@ -416,7 +407,7 @@ let CellOutputContainer = class CellOutputContainer extends CellContentPart {
         }));
         this._register(viewCell.onDidChangeOutputs(splice => {
             const executionState = this._notebookExecutionStateService.getCellExecution(viewCell.uri);
-            const context = executionState ? CellOutputUpdateContext.Execution : CellOutputUpdateContext.Other;
+            const context = executionState ? 1  : 2 ;
             this._updateOutputs(splice, context);
         }));
         this._register(viewCell.onDidChangeLayout(() => {
@@ -513,7 +504,7 @@ let CellOutputContainer = class CellOutputContainer extends CellContentPart {
             }, 200);
         }
     }
-    _updateOutputs(splice, context = CellOutputUpdateContext.Other) {
+    _updateOutputs(splice, context = 2 ) {
         const previousOutputHeight = this.viewCell.layoutInfo.outputTotalHeight;
         this.viewCell.updateOutputMinHeight(previousOutputHeight);
         if (this.viewCell.outputsViewModels.length) {
@@ -621,7 +612,7 @@ let CellOutputContainer = class CellOutputContainer extends CellContentPart {
             hide(this.templateData.outputShowMoreContainer.domNode);
         }
         this._relayoutCell();
-        this._validateFinalOutputHeight(context === CellOutputUpdateContext.Other && this.viewCell.outputsViewModels.length === 0);
+        this._validateFinalOutputHeight(context === 2  && this.viewCell.outputsViewModels.length === 0);
     }
     _generateShowMoreElement(disposables) {
         const md = {

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

@@ -1,13 +1,11 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { append, addDisposableListener, EventType, $ as $$1 } from '../../../../../../base/browser/dom.js';
+import { append, addDisposableListener, isHTMLElement, EventType, $ as $$1 } from '../../../../../../base/browser/dom.js';
 import { StandardKeyboardEvent } from '../../../../../../base/browser/keyboardEvent.js';
 import { SimpleIconLabel } from '../../../../../../base/browser/ui/iconLabel/simpleIconLabel.js';
 import { toErrorMessage } from '../../../../../../base/common/errorMessage.js';
 import { Emitter } from '../../../../../../base/common/event.js';
 import { stripIcons } from '../../../../../../base/common/iconLabels.js';
-import { KeyCode } from '../../../../../../base/common/keyCodes.js';
 import { DisposableStore, dispose, Disposable } from '../../../../../../base/common/lifecycle.js';
-import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
 import { isThemeColor } from '../../../../../../editor/common/editorCommon.js';
 import { ICommandService } from '../../../../../../platform/commands/common/commands.service.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
@@ -16,12 +14,9 @@ import { ITelemetryService } from '../../../../../../platform/telemetry/common/t
 import { IThemeService } from '../../../../../../platform/theme/common/themeService.service.js';
 import { CellFocusMode } from '../../notebookBrowser.js';
 import { CellContentPart } from '../cellPart.js';
-import { ClickTargetType } from './cellWidgets.js';
 import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
-import { CellStatusbarAlignment } from '../../../common/notebookCommon.js';
 import { IHoverService } from '../../../../../../platform/hover/browser/hover.service.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
-import { HoverPosition } from '../../../../../../base/browser/ui/hover/hoverWidget.js';
 const $ = $$1;
 let CellEditorStatusBar = class CellEditorStatusBar extends CellContentPart {
     constructor(_notebookEditor, _cellContainer, editorPart, _editor, _instantiationService, hoverService, configurationService, _themeService) {
@@ -48,7 +43,7 @@ let CellEditorStatusBar = class CellEditorStatusBar extends CellContentPart {
                 this._lastHoverHideTime = 0;
                 this.showHover = (options) => {
                     options.position = options.position ?? {};
-                    options.position.hoverPosition = HoverPosition.ABOVE;
+                    options.position.hoverPosition = 3 ;
                     return hoverService.showHover(options);
                 };
                 this.placement = 'element';
@@ -66,20 +61,31 @@ let CellEditorStatusBar = class CellEditorStatusBar extends CellContentPart {
         this._register(addDisposableListener(this.statusBarContainer, EventType.CLICK, e => {
             if (e.target === leftItemsContainer || e.target === rightItemsContainer || e.target === this.statusBarContainer) {
                 this._onDidClick.fire({
-                    type: ClickTargetType.Container,
+                    type: 0 ,
                     event: e
                 });
             }
             else {
-                if (e.target.classList.contains('cell-status-item-has-command')) {
+                const target = e.target;
+                let itemHasCommand = false;
+                if (target && isHTMLElement(target)) {
+                    const targetElement = target;
+                    if (targetElement.classList.contains('cell-status-item-has-command')) {
+                        itemHasCommand = true;
+                    }
+                    else if (targetElement.parentElement && targetElement.parentElement.classList.contains('cell-status-item-has-command')) {
+                        itemHasCommand = true;
+                    }
+                }
+                if (itemHasCommand) {
                     this._onDidClick.fire({
-                        type: ClickTargetType.ContributedCommandItem,
+                        type: 2 ,
                         event: e
                     });
                 }
                 else {
                     this._onDidClick.fire({
-                        type: ClickTargetType.ContributedTextItem,
+                        type: 1 ,
                         event: e
                     });
                 }
@@ -92,7 +98,7 @@ let CellEditorStatusBar = class CellEditorStatusBar extends CellContentPart {
                 ui: true,
                 cell: element,
                 notebookEditor: this._notebookEditor,
-                $mid: MarshalledId.NotebookCellActionContext
+                $mid: 13
             };
             this.updateContext(context);
         }
@@ -124,7 +130,7 @@ let CellEditorStatusBar = class CellEditorStatusBar extends CellContentPart {
                 }
             }));
             this.cellDisposables.add(this.onDidClick(e => {
-                if (this.currentCell instanceof CodeCellViewModel && e.type !== ClickTargetType.ContributedCommandItem && this._editor) {
+                if (this.currentCell instanceof CodeCellViewModel && e.type !== 2  && this._editor) {
                     const target = this._editor.getTargetAtClientPoint(e.event.clientX, e.event.clientY - this._notebookEditor.notebookOptions.computeEditorStatusbarHeight(this.currentCell.internalMetadata, this.currentCell.uri));
                     if (target?.position) {
                         this._editor.setPosition(target.position);
@@ -177,8 +183,8 @@ let CellEditorStatusBar = class CellEditorStatusBar extends CellContentPart {
             return (itemB.priority ?? 0) - (itemA.priority ?? 0);
         });
         const maxItemWidth = this.getMaxItemWidth();
-        const newLeftItems = items.filter(item => item.alignment === CellStatusbarAlignment.Left);
-        const newRightItems = items.filter(item => item.alignment === CellStatusbarAlignment.Right).reverse();
+        const newLeftItems = items.filter(item => item.alignment === 1 );
+        const newRightItems = items.filter(item => item.alignment === 2 ).reverse();
         const updateItems = (renderedItems, newItems, container) => {
             if (renderedItems.length > newItems.length) {
                 const deleted = renderedItems.splice(newItems.length, renderedItems.length - newItems.length);
@@ -272,7 +278,7 @@ let CellStatusBarItem = class CellStatusBarItem extends Disposable {
             }));
             this._itemDisposables.add(addDisposableListener(this.container, EventType.KEY_DOWN, e => {
                 const event = ( new StandardKeyboardEvent(e));
-                if (event.equals(KeyCode.Space) || event.equals(KeyCode.Enter)) {
+                if (event.equals(10 ) || event.equals(3 )) {
                     this.executeCommand();
                 }
             }));

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

@@ -3,7 +3,6 @@ import { isAncestorOfActiveElement } from '../../../../../../base/browser/dom.js
 import { ToolBar } from '../../../../../../base/browser/ui/toolbar/toolbar.js';
 import { disposableTimeout } from '../../../../../../base/common/async.js';
 import { Emitter } from '../../../../../../base/common/event.js';
-import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
 import { MenuEntryActionViewItem, createActionViewItem, createAndFillInActionBarActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../../../platform/actions/common/actions.service.js';
@@ -66,7 +65,7 @@ let BetweenCellToolbar = class BetweenCellToolbar extends CellOverlayPart {
                 cell: element,
                 notebookEditor: this._notebookEditor,
                 source: 'insertToolbar',
-                $mid: MarshalledId.NotebookCellActionContext
+                $mid: 13
             };
         }
         this.updateInternalLayoutNow(element);
@@ -159,7 +158,7 @@ let CellTitleToolbarPart = class CellTitleToolbarPart extends CellOverlayPart {
                 cell: element,
                 notebookEditor: this._notebookEditor,
                 source: 'cellToolbar',
-                $mid: MarshalledId.NotebookCellActionContext
+                $mid: 13
             };
             this.updateContext(view, toolbarContext);
         }

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

@@ -1,29 +1,27 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
+import { localize } from '../../../../../../nls.js';
 import { getWindow, append, $, modify, setVisibility, safeInnerHtml, runAtThisOrScheduleAtNextAnimationFrame, hide, show } from '../../../../../../base/browser/dom.js';
 import { raceCancellation } from '../../../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
-import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
 import { clamp } from '../../../../../../base/common/numbers.js';
 import { escape } from '../../../../../../base/common/strings.js';
-import { EditorOption } from '../../../../../../editor/common/config/editorOptions.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
 import { tokenizeToStringSync } from '../../../../../../editor/common/languages/textToHtmlTokenizer.js';
-import { localize } from '../../../../../../nls.js';
+import { CodeActionController } from '../../../../../../editor/contrib/codeAction/browser/codeActionController.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.service.js';
 import { IOpenerService } from '../../../../../../platform/opener/common/opener.service.js';
+import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
 import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID } from '../../notebookBrowser.js';
+import { outputDisplayLimit } from '../../viewModel/codeCellViewModel.js';
 import { CellEditorOptions } from './cellEditorOptions.js';
 import { CellOutputContainer } from './cellOutput.js';
 import { CollapsedCodeCellExecutionIcon } from './codeCellExecutionIcon.js';
-import { outputDisplayLimit } from '../../viewModel/codeCellViewModel.js';
-import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
-import { WordHighlighterContribution } from '../../../../../../editor/contrib/wordHighlighter/browser/wordHighlighter.js';
-import { CodeActionController } from '../../../../../../editor/contrib/codeAction/browser/codeActionController.js';
 let CodeCell = class CodeCell extends Disposable {
     constructor(notebookEditor, viewCell, templateData, editorPool, instantiationService, keybindingService, openerService, languageService, configurationService, notebookExecutionStateService) {
         super();
@@ -197,7 +195,7 @@ let CodeCell = class CodeCell extends Disposable {
         const isReadonly = this.notebookEditor.isReadOnly;
         const padding = this.notebookEditor.notebookOptions.computeEditorPadding(this.viewCell.internalMetadata, this.viewCell.uri);
         const options = editor.getOptions();
-        if (options.get(EditorOption.readOnly) !== isReadonly || options.get(EditorOption.padding) !== padding) {
+        if (options.get(94 ) !== isReadonly || options.get(86 ) !== padding) {
             editor.updateOptions({ readOnly: this.notebookEditor.isReadOnly, padding: this.notebookEditor.notebookOptions.computeEditorPadding(this.viewCell.internalMetadata, this.viewCell.uri) });
         }
     }
@@ -267,13 +265,9 @@ let CodeCell = class CodeCell extends Disposable {
             }
         }));
         this._register(this.templateData.editor.onDidBlurEditorWidget(() => {
-            WordHighlighterContribution.get(this.templateData.editor)?.stopHighlighting();
             CodeActionController.get(this.templateData.editor)?.hideCodeActions();
             CodeActionController.get(this.templateData.editor)?.hideLightBulbWidget();
         }));
-        this._register(this.templateData.editor.onDidFocusEditorWidget(() => {
-            WordHighlighterContribution.get(this.templateData.editor)?.restoreViewState(true);
-        }));
     }
     _reigsterModelListeners(model) {
         this._register(model.onDidChangeTokens(() => {
@@ -378,8 +372,8 @@ let CodeCell = class CodeCell extends Disposable {
         const expandIcon = $('span.expandInputIcon');
         const keybinding = this.keybindingService.lookupKeybinding(EXPAND_CELL_INPUT_COMMAND_ID);
         if (keybinding) {
-            element.title = ( localize(11463, "Double-click to expand cell input ({0})", keybinding.getLabel()));
-            expandIcon.title = ( localize(11464, "Expand Cell Input ({0})", keybinding.getLabel()));
+            element.title = ( localize(11590, "Double-click to expand cell input ({0})", keybinding.getLabel()));
+            expandIcon.title = ( localize(11591, "Expand Cell Input ({0})", keybinding.getLabel()));
         }
         expandIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.more));
         element.appendChild(expandIcon);

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

@@ -49,26 +49,26 @@ let CollapsedCodeCellExecutionIcon = class CollapsedCodeCellExecutionIcon extend
         if (!state && lastRunSuccess) {
             return {
                 text: `$(${successStateIcon.id})`,
-                tooltip: ( localize(11590, "Success")),
+                tooltip: ( localize(11733, "Success")),
             };
         }
         else if (!state && lastRunSuccess === false) {
             return {
                 text: `$(${errorStateIcon.id})`,
-                tooltip: ( localize(11591, "Failure")),
+                tooltip: ( localize(11734, "Failure")),
             };
         }
         else if (state === NotebookCellExecutionState.Pending || state === NotebookCellExecutionState.Unconfirmed) {
             return {
                 text: `$(${pendingStateIcon.id})`,
-                tooltip: ( localize(11592, "Pending")),
+                tooltip: ( localize(11735, "Pending")),
             };
         }
         else if (state === NotebookCellExecutionState.Executing) {
             const icon = ThemeIcon.modify(executingStateIcon, 'spin');
             return {
                 text: `$(${icon.id})`,
-                tooltip: ( localize(11593, "Executing")),
+                tooltip: ( localize(11736, "Executing")),
             };
         }
         return;

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

@@ -2,7 +2,6 @@ import { __decorate, __param } from '../../../../../../../../../external/tslib/t
 import { ToolBar } from '../../../../../../base/browser/ui/toolbar/toolbar.js';
 import { Action } from '../../../../../../base/common/actions.js';
 import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
-import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
 import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.js';
 import { localize } from '../../../../../../nls.js';
 import { DropdownWithPrimaryActionViewItem } from '../../../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
@@ -17,7 +16,7 @@ import { CellContentPart } from '../cellPart.js';
 import { registerCellToolbarStickyScroll } from './cellToolbarStickyScroll.js';
 import { NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_TYPE } from '../../../common/notebookContextKeys.js';
 let RunToolbar = class RunToolbar extends CellContentPart {
-    constructor(notebookEditor, contextKeyService, cellContainer, runButtonContainer, menuService, keybindingService, contextMenuService, instantiationService) {
+    constructor(notebookEditor, contextKeyService, cellContainer, runButtonContainer, primaryMenuId, secondaryMenuId, menuService, keybindingService, contextMenuService, instantiationService) {
         super();
         this.notebookEditor = notebookEditor;
         this.contextKeyService = contextKeyService;
@@ -26,8 +25,8 @@ let RunToolbar = class RunToolbar extends CellContentPart {
         this.keybindingService = keybindingService;
         this.contextMenuService = contextMenuService;
         this.instantiationService = instantiationService;
-        this.primaryMenu = this._register(menuService.createMenu(this.notebookEditor.creationOptions.menuIds.cellExecutePrimary, contextKeyService));
-        this.secondaryMenu = this._register(menuService.createMenu(this.notebookEditor.creationOptions.menuIds.cellExecuteToolbar, contextKeyService));
+        this.primaryMenu = this._register(menuService.createMenu(primaryMenuId, contextKeyService));
+        this.secondaryMenu = this._register(menuService.createMenu(secondaryMenuId, contextKeyService));
         this.createRunCellToolbar(runButtonContainer, cellContainer, contextKeyService);
         const updateActions = () => {
             const actions = this.getCellToolbarActions(this.primaryMenu);
@@ -46,7 +45,7 @@ let RunToolbar = class RunToolbar extends CellContentPart {
                 ui: true,
                 cell: element,
                 notebookEditor: this.notebookEditor,
-                $mid: MarshalledId.NotebookCellActionContext
+                $mid: 13
             };
             this.toolbar.context = context;
         }
@@ -60,7 +59,7 @@ let RunToolbar = class RunToolbar extends CellContentPart {
     }
     createRunCellToolbar(container, cellContainer, contextKeyService) {
         const actionViewItemDisposables = this._register(( (new DisposableStore())));
-        const dropdownAction = this._register(( (new Action('notebook.moreRunActions', ( localize(11465, "More...")), 'codicon-chevron-down', true))));
+        const dropdownAction = this._register(( (new Action('notebook.moreRunActions', ( localize(11589, "More...")), 'codicon-chevron-down', true))));
         const keybindingProvider = (action) => this.keybindingService.lookupKeybinding(action.id, executionContextKeyService);
         const executionContextKeyService = this._register(getCodeCellExecutionContextKeyService(contextKeyService));
         this.toolbar = this._register(( (new ToolBar(container, this.contextMenuService, {
@@ -75,7 +74,7 @@ let RunToolbar = class RunToolbar extends CellContentPart {
                 if (!secondary.length) {
                     return undefined;
                 }
-                const item = this.instantiationService.createInstance(DropdownWithPrimaryActionViewItem, primary, dropdownAction, secondary, 'notebook-cell-run-toolbar', this.contextMenuService, {
+                const item = this.instantiationService.createInstance(DropdownWithPrimaryActionViewItem, primary, dropdownAction, secondary, 'notebook-cell-run-toolbar', {
                     ..._options,
                     getKeyBinding: keybindingProvider
                 });
@@ -89,10 +88,10 @@ let RunToolbar = class RunToolbar extends CellContentPart {
     }
 };
 RunToolbar = ( (__decorate([
-    ( (__param(4, IMenuService))),
-    ( (__param(5, IKeybindingService))),
-    ( (__param(6, IContextMenuService))),
-    ( (__param(7, IInstantiationService)))
+    ( (__param(6, IMenuService))),
+    ( (__param(7, IKeybindingService))),
+    ( (__param(8, IContextMenuService))),
+    ( (__param(9, IInstantiationService)))
 ], RunToolbar)));
 function getCodeCellExecutionContextKeyService(contextKeyService) {
     const executionContextKeyService = contextKeyService.createScoped(document.createElement('div'));

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

@@ -12,13 +12,13 @@ let CollapsedCellOutput = class CollapsedCellOutput extends CellContentPart {
         super();
         this.notebookEditor = notebookEditor;
         const placeholder = append(cellOutputCollapseContainer, $('span.expandOutputPlaceholder'));
-        placeholder.textContent = ( localize(11466, "Outputs are collapsed"));
+        placeholder.textContent = ( localize(11592, "Outputs are collapsed"));
         const expandIcon = append(cellOutputCollapseContainer, $('span.expandOutputIcon'));
         expandIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.more));
         const keybinding = keybindingService.lookupKeybinding(EXPAND_CELL_OUTPUT_COMMAND_ID);
         if (keybinding) {
-            placeholder.title = ( localize(11467, "Double-click to expand cell output ({0})", keybinding.getLabel()));
-            cellOutputCollapseContainer.title = ( localize(11468, "Expand Cell Output (${0})", keybinding.getLabel()));
+            placeholder.title = ( localize(11593, "Double-click to expand cell output ({0})", keybinding.getLabel()));
+            cellOutputCollapseContainer.title = ( localize(11594, "Expand Cell Output (${0})", keybinding.getLabel()));
         }
         hide(cellOutputCollapseContainer);
         this._register(addDisposableListener(expandIcon, EventType.CLICK, () => this.expand()));