@codingame/monaco-vscode-api 36.2.7 → 37.1.0

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

@@ -2821,51 +2821,51 @@ const notebookCellBorder = registerColor("notebook.cellBorderColor", {
     light: ( transparent(listInactiveSelectionBackground, 1)),
     hcDark: PANEL_BORDER,
     hcLight: PANEL_BORDER
-}, ( localize(12738, "The border color for notebook cells.")));
-registerColor("notebook.focusedEditorBorder", focusBorder, ( localize(12739, "The color of the notebook cell editor border.")));
+}, ( localize(14721, "The border color for notebook cells.")));
+registerColor("notebook.focusedEditorBorder", focusBorder, ( localize(14722, "The color of the notebook cell editor border.")));
 const cellStatusIconSuccess = registerColor(
     "notebookStatusSuccessIcon.foreground",
     debugIconStartForeground,
-    ( localize(12740, "The error icon color of notebook cells in the cell status bar."))
+    ( localize(14723, "The error icon color of notebook cells in the cell status bar."))
 );
 const runningCellRulerDecorationColor = registerColor(
     "notebookEditorOverviewRuler.runningCellForeground",
     debugIconStartForeground,
     ( localize(
-    12741,
+    14724,
     "The color of the running cell decoration in the notebook editor overview ruler."
 ))
 );
-const cellStatusIconError = registerColor("notebookStatusErrorIcon.foreground", errorForeground, ( localize(12742, "The error icon color of notebook cells in the cell status bar.")));
-registerColor("notebookStatusRunningIcon.foreground", foreground, ( localize(12743, "The running icon color of notebook cells in the cell status bar.")));
-registerColor("notebook.outputContainerBorderColor", null, ( localize(12744, "The border color of the notebook output container.")));
-registerColor("notebook.outputContainerBackgroundColor", null, ( localize(12745, "The color of the notebook output container background.")));
+const cellStatusIconError = registerColor("notebookStatusErrorIcon.foreground", errorForeground, ( localize(14725, "The error icon color of notebook cells in the cell status bar.")));
+registerColor("notebookStatusRunningIcon.foreground", foreground, ( localize(14726, "The running icon color of notebook cells in the cell status bar.")));
+registerColor("notebook.outputContainerBorderColor", null, ( localize(14727, "The border color of the notebook output container.")));
+registerColor("notebook.outputContainerBackgroundColor", null, ( localize(14728, "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(12746, "The color of the separator in the cell bottom toolbar")));
-const focusedCellBackground = registerColor("notebook.focusedCellBackground", null, ( localize(12747, "The background color of a cell when the cell is focused.")));
+}, ( localize(14729, "The color of the separator in the cell bottom toolbar")));
+const focusedCellBackground = registerColor("notebook.focusedCellBackground", null, ( localize(14730, "The background color of a cell when the cell is focused.")));
 registerColor("notebook.selectedCellBackground", {
     dark: listInactiveSelectionBackground,
     light: listInactiveSelectionBackground,
     hcDark: null,
     hcLight: null
-}, ( localize(12748, "The background color of a cell when the cell is selected.")));
+}, ( localize(14731, "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(12749, "The background color of a cell when the cell is hovered.")));
+}, ( localize(14732, "The background color of a cell when the cell is hovered.")));
 registerColor("notebook.selectedCellBorder", {
     dark: notebookCellBorder,
     light: notebookCellBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
 }, ( localize(
-    12750,
+    14733,
     "The color of the cell's top and bottom border when the cell is selected but not focused."
 )));
 registerColor("notebook.inactiveSelectedCellBorder", {
@@ -2873,13 +2873,13 @@ registerColor("notebook.inactiveSelectedCellBorder", {
     light: null,
     hcDark: focusBorder,
     hcLight: focusBorder
-}, ( localize(12751, "The color of the cell's borders when multiple cells are selected.")));
+}, ( localize(14734, "The color of the cell's borders when multiple cells are selected.")));
 registerColor("notebook.focusedCellBorder", focusBorder, ( localize(
-    12752,
+    14735,
     "The color of the cell's focus indicator borders when the cell is focused."
 )));
 registerColor("notebook.inactiveFocusedCellBorder", notebookCellBorder, ( localize(
-    12753,
+    14736,
     "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", {
@@ -2887,40 +2887,40 @@ 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(12754, "The background color of notebook cell status bar items.")));
-registerColor("notebook.cellInsertionIndicator", focusBorder, ( localize(12755, "The color of the notebook cell insertion indicator.")));
+}, ( localize(14737, "The background color of notebook cell status bar items.")));
+registerColor("notebook.cellInsertionIndicator", focusBorder, ( localize(14738, "The color of the notebook cell insertion indicator.")));
 registerColor(
     "notebookScrollbarSlider.background",
     scrollbarSliderBackground,
-    ( localize(12756, "Notebook scrollbar slider background color."))
+    ( localize(14739, "Notebook scrollbar slider background color."))
 );
 registerColor(
     "notebookScrollbarSlider.hoverBackground",
     scrollbarSliderHoverBackground,
-    ( localize(12757, "Notebook scrollbar slider background color when hovering."))
+    ( localize(14740, "Notebook scrollbar slider background color when hovering."))
 );
 registerColor(
     "notebookScrollbarSlider.activeBackground",
     scrollbarSliderActiveBackground,
-    ( localize(12758, "Notebook scrollbar slider background color when clicked on."))
+    ( localize(14741, "Notebook scrollbar slider background color when clicked on."))
 );
 registerColor("notebook.symbolHighlightBackground", {
     dark: ( Color.fromHex("#ffffff0b")),
     light: ( Color.fromHex("#fdff0033")),
     hcDark: null,
     hcLight: null
-}, ( localize(12759, "Background color of highlighted cell")));
+}, ( localize(14742, "Background color of highlighted cell")));
 registerColor("notebook.cellEditorBackground", {
     light: SIDE_BAR_BACKGROUND,
     dark: SIDE_BAR_BACKGROUND,
     hcDark: null,
     hcLight: null
-}, ( localize(12760, "Cell editor background color.")));
+}, ( localize(14743, "Cell editor background color.")));
 const notebookEditorBackground = registerColor("notebook.editorBackground", {
     light: EDITOR_PANE_BACKGROUND,
     dark: EDITOR_PANE_BACKGROUND,
     hcDark: null,
     hcLight: null
-}, ( localize(12761, "Notebook background color.")));
+}, ( localize(14744, "Notebook background color.")));
 
 export { NotebookEditorWidget, cellStatusIconError, cellStatusIconSuccess, focusedCellBackground, getDefaultNotebookCreationOptions, notebookCellBorder, runningCellRulerDecorationColor };

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

@@ -3,34 +3,34 @@ 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(12793, "Configure icon to select a kernel in notebook editors.")));
-const executeIcon = registerIcon("notebook-execute", Codicon.play, ( localize(12794, "Icon to execute in notebook editors.")));
-const executeAboveIcon = registerIcon("notebook-execute-above", Codicon.runAbove, ( localize(12795, "Icon to execute above cells in notebook editors.")));
-const executeBelowIcon = registerIcon("notebook-execute-below", Codicon.runBelow, ( localize(12796, "Icon to execute below cells in notebook editors.")));
-const stopIcon = registerIcon("notebook-stop", Codicon.primitiveSquare, ( localize(12797, "Icon to stop an execution in notebook editors.")));
-const deleteCellIcon = registerIcon("notebook-delete-cell", Codicon.trash, ( localize(12798, "Icon to delete a cell in notebook editors.")));
-const executeAllIcon = registerIcon("notebook-execute-all", Codicon.runAll, ( localize(12799, "Icon to execute all cells in notebook editors.")));
-const editIcon = registerIcon("notebook-edit", Codicon.pencil, ( localize(12800, "Icon to edit a cell in notebook editors.")));
-const stopEditIcon = registerIcon("notebook-stop-edit", Codicon.check, ( localize(12801, "Icon to stop editing a cell in notebook editors.")));
-const moveUpIcon = registerIcon("notebook-move-up", Codicon.arrowUp, ( localize(12802, "Icon to move up a cell in notebook editors.")));
-const moveDownIcon = registerIcon("notebook-move-down", Codicon.arrowDown, ( localize(12803, "Icon to move down a cell in notebook editors.")));
-const clearIcon = registerIcon("notebook-clear", Codicon.clearAll, ( localize(12804, "Icon to clear cell outputs in notebook editors.")));
-const splitCellIcon = registerIcon("notebook-split-cell", Codicon.splitVertical, ( localize(12805, "Icon to split a cell in notebook editors.")));
-const successStateIcon = registerIcon("notebook-state-success", Codicon.check, ( localize(12806, "Icon to indicate a success state in notebook editors.")));
-const errorStateIcon = registerIcon("notebook-state-error", Codicon.error, ( localize(12807, "Icon to indicate an error state in notebook editors.")));
-const pendingStateIcon = registerIcon("notebook-state-pending", Codicon.clock, ( localize(12808, "Icon to indicate a pending state in notebook editors.")));
-const executingStateIcon = registerIcon("notebook-state-executing", Codicon.sync, ( localize(12809, "Icon to indicate an executing state in notebook editors.")));
-const collapsedIcon = registerIcon("notebook-collapsed", Codicon.chevronRight, ( localize(12810, "Icon to annotate a collapsed section in notebook editors.")));
-const expandedIcon = registerIcon("notebook-expanded", Codicon.chevronDown, ( localize(12811, "Icon to annotate an expanded section in notebook editors.")));
-const openAsTextIcon = registerIcon("notebook-open-as-text", Codicon.fileCode, ( localize(12812, "Icon to open the notebook in a text editor.")));
-const revertIcon = registerIcon("notebook-revert", Codicon.discard, ( localize(12813, "Icon to revert in notebook editors.")));
-const toggleWhitespace = registerIcon("notebook-diff-cell-toggle-whitespace", Codicon.whitespace, ( localize(12814, "Icon for the toggle whitespace action in the diff editor.")));
-const renderOutputIcon = registerIcon("notebook-render-output", Codicon.preview, ( localize(12815, "Icon to render output in diff editor.")));
-const mimetypeIcon = registerIcon("notebook-mimetype", Codicon.code, ( localize(12816, "Icon for a mime type in notebook editors.")));
-const copyIcon = registerIcon("notebook-copy", Codicon.copy, ( localize(12817, "Icon to copy content to clipboard")));
-const saveIcon = registerIcon("notebook-save", Codicon.save, ( localize(12818, "Icon to save content to disk")));
-const previousChangeIcon = registerIcon("notebook-diff-editor-previous-change", Codicon.arrowUp, ( localize(12819, "Icon for the previous change action in the diff editor.")));
-const nextChangeIcon = registerIcon("notebook-diff-editor-next-change", Codicon.arrowDown, ( localize(12820, "Icon for the next change action in the diff editor.")));
-const variablesViewIcon = registerIcon("variables-view-icon", Codicon.variableGroup, ( localize(12821, "View icon of the variables view.")));
+const selectKernelIcon = registerIcon("notebook-kernel-select", Codicon.serverEnvironment, ( localize(14776, "Configure icon to select a kernel in notebook editors.")));
+const executeIcon = registerIcon("notebook-execute", Codicon.play, ( localize(14777, "Icon to execute in notebook editors.")));
+const executeAboveIcon = registerIcon("notebook-execute-above", Codicon.runAbove, ( localize(14778, "Icon to execute above cells in notebook editors.")));
+const executeBelowIcon = registerIcon("notebook-execute-below", Codicon.runBelow, ( localize(14779, "Icon to execute below cells in notebook editors.")));
+const stopIcon = registerIcon("notebook-stop", Codicon.primitiveSquare, ( localize(14780, "Icon to stop an execution in notebook editors.")));
+const deleteCellIcon = registerIcon("notebook-delete-cell", Codicon.trash, ( localize(14781, "Icon to delete a cell in notebook editors.")));
+const executeAllIcon = registerIcon("notebook-execute-all", Codicon.runAll, ( localize(14782, "Icon to execute all cells in notebook editors.")));
+const editIcon = registerIcon("notebook-edit", Codicon.pencil, ( localize(14783, "Icon to edit a cell in notebook editors.")));
+const stopEditIcon = registerIcon("notebook-stop-edit", Codicon.check, ( localize(14784, "Icon to stop editing a cell in notebook editors.")));
+const moveUpIcon = registerIcon("notebook-move-up", Codicon.arrowUp, ( localize(14785, "Icon to move up a cell in notebook editors.")));
+const moveDownIcon = registerIcon("notebook-move-down", Codicon.arrowDown, ( localize(14786, "Icon to move down a cell in notebook editors.")));
+const clearIcon = registerIcon("notebook-clear", Codicon.clearAll, ( localize(14787, "Icon to clear cell outputs in notebook editors.")));
+const splitCellIcon = registerIcon("notebook-split-cell", Codicon.splitVertical, ( localize(14788, "Icon to split a cell in notebook editors.")));
+const successStateIcon = registerIcon("notebook-state-success", Codicon.check, ( localize(14789, "Icon to indicate a success state in notebook editors.")));
+const errorStateIcon = registerIcon("notebook-state-error", Codicon.error, ( localize(14790, "Icon to indicate an error state in notebook editors.")));
+const pendingStateIcon = registerIcon("notebook-state-pending", Codicon.clock, ( localize(14791, "Icon to indicate a pending state in notebook editors.")));
+const executingStateIcon = registerIcon("notebook-state-executing", Codicon.sync, ( localize(14792, "Icon to indicate an executing state in notebook editors.")));
+const collapsedIcon = registerIcon("notebook-collapsed", Codicon.chevronRight, ( localize(14793, "Icon to annotate a collapsed section in notebook editors.")));
+const expandedIcon = registerIcon("notebook-expanded", Codicon.chevronDown, ( localize(14794, "Icon to annotate an expanded section in notebook editors.")));
+const openAsTextIcon = registerIcon("notebook-open-as-text", Codicon.fileCode, ( localize(14795, "Icon to open the notebook in a text editor.")));
+const revertIcon = registerIcon("notebook-revert", Codicon.discard, ( localize(14796, "Icon to revert in notebook editors.")));
+const toggleWhitespace = registerIcon("notebook-diff-cell-toggle-whitespace", Codicon.whitespace, ( localize(14797, "Icon for the toggle whitespace action in the diff editor.")));
+const renderOutputIcon = registerIcon("notebook-render-output", Codicon.preview, ( localize(14798, "Icon to render output in diff editor.")));
+const mimetypeIcon = registerIcon("notebook-mimetype", Codicon.code, ( localize(14799, "Icon for a mime type in notebook editors.")));
+const copyIcon = registerIcon("notebook-copy", Codicon.copy, ( localize(14800, "Icon to copy content to clipboard")));
+const saveIcon = registerIcon("notebook-save", Codicon.save, ( localize(14801, "Icon to save content to disk")));
+const previousChangeIcon = registerIcon("notebook-diff-editor-previous-change", Codicon.arrowUp, ( localize(14802, "Icon for the previous change action in the diff editor.")));
+const nextChangeIcon = registerIcon("notebook-diff-editor-next-change", Codicon.arrowDown, ( localize(14803, "Icon for the next change action in the diff editor.")));
+const variablesViewIcon = registerIcon("variables-view-icon", Codicon.variableGroup, ( localize(14804, "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, saveIcon, selectKernelIcon, splitCellIcon, stopEditIcon, stopIcon, successStateIcon, toggleWhitespace, variablesViewIcon };

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

@@ -120,7 +120,6 @@ export declare class NotebookOptions extends Disposable {
     } | undefined, configurationService: IConfigurationService, notebookExecutionStateService: INotebookExecutionStateService, codeEditorService: ICodeEditorService);
     updateOptions(isReadonly: boolean): void;
     private _computeEditorTopPadding;
-    private _migrateDeprecatedSetting;
     private _computeOutputLineHeight;
     private _updateConfiguration;
     private _computeInsertToolbarPositionOption;

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

@@ -76,44 +76,10 @@ let NotebookOptions = class NotebookOptions extends Disposable {
         let editorOptionsCustomizations = this.configurationService.getValue(NotebookSetting.cellEditorOptionsCustomizations) ?? {};
         editorOptionsCustomizations = isObject(editorOptionsCustomizations) ? editorOptionsCustomizations : {};
         const interactiveWindowCollapseCodeCells = this.configurationService.getValue(NotebookSetting.interactiveWindowCollapseCodeCells);
-        let outputLineHeightSettingValue;
-        const deprecatedOutputLineHeightSetting = this.configurationService.getValue(NotebookSetting.outputLineHeightDeprecated);
-        if (deprecatedOutputLineHeightSetting !== undefined) {
-            this._migrateDeprecatedSetting(
-                NotebookSetting.outputLineHeightDeprecated,
-                NotebookSetting.outputLineHeight
-            );
-            outputLineHeightSettingValue = deprecatedOutputLineHeightSetting;
-        } else {
-            outputLineHeightSettingValue = this.configurationService.getValue(NotebookSetting.outputLineHeight);
-        }
-        let outputFontSize;
-        const deprecatedOutputFontSizeSetting = this.configurationService.getValue(NotebookSetting.outputFontSizeDeprecated);
-        if (deprecatedOutputFontSizeSetting !== undefined) {
-            this._migrateDeprecatedSetting(NotebookSetting.outputFontSizeDeprecated, NotebookSetting.outputFontSize);
-            outputFontSize = deprecatedOutputFontSizeSetting;
-        } else {
-            outputFontSize = this.configurationService.getValue(NotebookSetting.outputFontSize) || fontSize;
-        }
-        let outputFontFamily;
-        const deprecatedOutputFontFamilySetting = this.configurationService.getValue(NotebookSetting.outputFontFamilyDeprecated);
-        if (deprecatedOutputFontFamilySetting !== undefined) {
-            this._migrateDeprecatedSetting(
-                NotebookSetting.outputFontFamilyDeprecated,
-                NotebookSetting.outputFontFamily
-            );
-            outputFontFamily = deprecatedOutputFontFamilySetting;
-        } else {
-            outputFontFamily = this.configurationService.getValue(NotebookSetting.outputFontFamily);
-        }
-        let outputScrolling;
-        const deprecatedOutputScrollingSetting = this.configurationService.getValue(NotebookSetting.outputScrollingDeprecated);
-        if (deprecatedOutputScrollingSetting !== undefined) {
-            this._migrateDeprecatedSetting(NotebookSetting.outputScrollingDeprecated, NotebookSetting.outputScrolling);
-            outputScrolling = deprecatedOutputScrollingSetting;
-        } else {
-            outputScrolling = this.configurationService.getValue(NotebookSetting.outputScrolling);
-        }
+        const outputLineHeightSettingValue = this.configurationService.getValue(NotebookSetting.outputLineHeight);
+        const outputFontSize = this.configurationService.getValue(NotebookSetting.outputFontSize) || fontSize;
+        const outputFontFamily = this.configurationService.getValue(NotebookSetting.outputFontFamily);
+        const outputScrolling = this.configurationService.getValue(NotebookSetting.outputScrolling);
         const outputLineHeight = this._computeOutputLineHeight(outputLineHeightSettingValue, outputFontSize);
         const outputWordWrap = this.configurationService.getValue(NotebookSetting.outputWordWrap);
         const outputLineLimit = this.configurationService.getValue(NotebookSetting.textOutputLineLimit) ?? 30;
@@ -229,37 +195,6 @@ let NotebookOptions = class NotebookOptions extends Disposable {
         this.codeEditorService.listDecorationTypes().forEach(onDidAddDecorationType);
         return this._editorTopPadding;
     }
-    _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);
-        }
-        if (deprecatedSetting.user !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.USER);
-            this.configurationService.updateValue(key, deprecatedSetting.user.value, ConfigurationTarget.USER);
-        }
-        if (deprecatedSetting.userLocal !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.USER_LOCAL);
-            this.configurationService.updateValue(key, deprecatedSetting.userLocal.value, ConfigurationTarget.USER_LOCAL);
-        }
-        if (deprecatedSetting.userRemote !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.USER_REMOTE);
-            this.configurationService.updateValue(key, deprecatedSetting.userRemote.value, ConfigurationTarget.USER_REMOTE);
-        }
-        if (deprecatedSetting.workspace !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.WORKSPACE);
-            this.configurationService.updateValue(key, deprecatedSetting.workspace.value, ConfigurationTarget.WORKSPACE);
-        }
-        if (deprecatedSetting.workspaceFolder !== undefined) {
-            this.configurationService.updateValue(deprecatedKey, undefined, ConfigurationTarget.WORKSPACE_FOLDER);
-            this.configurationService.updateValue(
-                key,
-                deprecatedSetting.workspaceFolder.value,
-                ConfigurationTarget.WORKSPACE_FOLDER
-            );
-        }
-    }
     _computeOutputLineHeight(lineHeight, outputFontSize) {
         const minimumLineHeight = 9;
         if (lineHeight === 0) {

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

@@ -147,7 +147,7 @@ class CellEditorOptions extends CellContentPart {
             type: "string",
             enum: ["off", "on"],
             default: "off",
-            markdownDescription: ( localize(12833, "Controls the display of line numbers in the cell editor."))
+            markdownDescription: ( localize(14816, "Controls the display of line numbers in the cell editor."))
         }
     }
 });
@@ -155,8 +155,8 @@ registerAction2(class ToggleLineNumberAction extends Action2 {
     constructor() {
         super({
             id: "notebook.toggleLineNumbers",
-            title: ( localize2(12834, "Toggle Notebook Line Numbers")),
-            shortTitle: ( localize2(12835, "Line Numbers")),
+            title: ( localize2(14817, "Toggle Notebook Line Numbers")),
+            shortTitle: ( localize2(14818, "Line Numbers")),
             precondition: NOTEBOOK_EDITOR_FOCUSED,
             menu: [{
                 id: MenuId.NotebookToolbar,
@@ -168,7 +168,7 @@ registerAction2(class ToggleLineNumberAction extends Action2 {
             f1: true,
             toggled: {
                 condition: ( ContextKeyExpr.notEquals("config.notebook.lineNumbers", "off")),
-                title: ( localize(12836, "Line Numbers"))
+                title: ( localize(14819, "Line Numbers"))
             }
         });
     }
@@ -186,7 +186,7 @@ registerAction2(class ToggleActiveLineNumberAction extends NotebookMultiCellActi
     constructor() {
         super({
             id: "notebook.cell.toggleLineNumbers",
-            title: ( localize(12837, "Show Cell Line Numbers")),
+            title: ( localize(14820, "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

@@ -204,13 +204,13 @@ let CellOutputElement = class CellOutputElement extends Disposable {
     }
     _renderMissingRenderer(viewModel, preferredMimeType) {
         if (!viewModel.model.outputs.length) {
-            return this._renderMessage(viewModel, ( localize(12838, "Cell has no output")));
+            return this._renderMessage(viewModel, ( localize(14821, "Cell has no output")));
         }
         if (!preferredMimeType) {
             const mimeTypes = ( viewModel.model.outputs.map(op => op.mime));
             const mimeTypesMessage = mimeTypes.join(", ");
             return this._renderMessage(viewModel, ( localize(
-                12839,
+                14822,
                 "No renderer could be found for output. It has the following mimetypes: {0}",
                 mimeTypesMessage
             )));
@@ -292,7 +292,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             notebookEditor: this.notebookEditor,
             $mid: MarshalledId.NotebookCellActionContext
         };
-        const pickAction = this.toolbarDisposables.add(( new Action("notebook.output.pickMimetype", ( localize(12840, "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(14823, "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);
@@ -335,13 +335,13 @@ let CellOutputElement = class CellOutputElement extends Disposable {
                     index: index,
                     picked: index === currIndex,
                     detail: this._generateRendererInfo(mimeType.rendererId),
-                    description: index === currIndex ? ( localize(12841, "Currently Active")) : undefined
+                    description: index === currIndex ? ( localize(14824, "Currently Active")) : undefined
                 });
             }
         });
         if (( unsupportedItems.some(m => JUPYTER_RENDERER_MIMETYPES.includes(m.id)))) {
             unsupportedItems.push({
-                label: ( localize(12842, "Install additional renderers from the marketplace")),
+                label: ( localize(14825, "Install additional renderers from the marketplace")),
                 id: "installRenderers",
                 index: mimeTypes.length
             });
@@ -354,7 +354,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             type: "separator"
         }, ...unsupportedItems];
         picker.activeItems = items.filter(item => !!item.picked);
-        picker.placeholder = items.length !== mimeTypes.length ? ( localize(12843, "Select mimetype to render for current output")) : ( localize(12844, "Select mimetype to render for current output"));
+        picker.placeholder = items.length !== mimeTypes.length ? ( localize(14826, "Select mimetype to render for current output")) : ( localize(14827, "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);
@@ -396,7 +396,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             const displayName = renderInfo.displayName !== "" ? renderInfo.displayName : renderInfo.id;
             return `${displayName} (${renderInfo.extensionId.value})`;
         }
-        return localize(12845, "renderer not available");
+        return localize(14828, "renderer not available");
     }
     _validateFinalOutputHeight(synchronous) {
         if (this._outputHeightTimer !== null) {

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

@@ -6,6 +6,9 @@ function registerCellToolbarStickyScroll(notebookEditor, cell, element, opts) {
     const extraOffset = opts?.extraOffset ?? 0;
     const min = opts?.min ?? 0;
     const updateForScroll = () => {
+        if (notebookEditor.getCellByHandle(cell.handle) !== cell) {
+            return;
+        }
         if (cell.isInputCollapsed) {
             element.style.top = '';
         }

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

@@ -76,7 +76,7 @@ export declare class CodeCellLayout {
     private readonly _logService;
     private readonly _initialEditorDimension;
     private _editorVisibility?;
-    get editorVisibility(): "Full" | "Top Clipped" | "Bottom Clipped" | "Full (Small Viewport)" | "Invisible" | undefined;
+    get editorVisibility(): "Bottom Clipped" | "Full" | "Full (Small Viewport)" | "Invisible" | "Top Clipped" | undefined;
     private _isUpdatingLayout?;
     get isUpdatingLayout(): boolean | undefined;
     _previousScrollBottom?: number;

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

@@ -498,8 +498,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(12846, "Double-click to expand cell input ({0})", keybinding.getLabel()));
-            expandIcon.title = ( localize(12847, "Expand Cell Input ({0})", keybinding.getLabel()));
+            element.title = ( localize(14829, "Double-click to expand cell input ({0})", keybinding.getLabel()));
+            expandIcon.title = ( localize(14830, "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

@@ -52,23 +52,23 @@ let CollapsedCodeCellExecutionIcon = class CollapsedCodeCellExecutionIcon extend
         if (!state && lastRunSuccess) {
             return {
                 text: `$(${successStateIcon.id})`,
-                tooltip: ( localize(12848, "Success"))
+                tooltip: ( localize(14831, "Success"))
             };
         } else if (!state && lastRunSuccess === false) {
             return {
                 text: `$(${errorStateIcon.id})`,
-                tooltip: ( localize(12849, "Failure"))
+                tooltip: ( localize(14832, "Failure"))
             };
         } else if (state === NotebookCellExecutionState.Pending || state === NotebookCellExecutionState.Unconfirmed) {
             return {
                 text: `$(${pendingStateIcon.id})`,
-                tooltip: ( localize(12850, "Pending"))
+                tooltip: ( localize(14833, "Pending"))
             };
         } else if (state === NotebookCellExecutionState.Executing) {
             const icon = ThemeIcon.modify(executingStateIcon, "spin");
             return {
                 text: `$(${icon.id})`,
-                tooltip: ( localize(12851, "Executing"))
+                tooltip: ( localize(14834, "Executing"))
             };
         }
         return;

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

@@ -74,7 +74,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(12852, "More...")), "codicon-chevron-down", true)));
+        const dropdownAction = this._register(( new Action("notebook.moreRunActions", ( localize(14835, "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, {

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

@@ -14,13 +14,13 @@ let CollapsedCellOutput = class CollapsedCellOutput extends CellContentPart {
         super();
         this.notebookEditor = notebookEditor;
         const placeholder = append(cellOutputCollapseContainer, $("span.expandOutputPlaceholder"));
-        placeholder.textContent = ( localize(12853, "Outputs are collapsed"));
+        placeholder.textContent = ( localize(14836, "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(12854, "Double-click to expand cell output ({0})", keybinding.getLabel()));
-            cellOutputCollapseContainer.title = ( localize(12855, "Expand Cell Output (${0})", keybinding.getLabel()));
+            placeholder.title = ( localize(14837, "Double-click to expand cell output ({0})", keybinding.getLabel()));
+            cellOutputCollapseContainer.title = ( localize(14838, "Expand Cell Output (${0})", keybinding.getLabel()));
         }
         hide(cellOutputCollapseContainer);
         this._register(

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

@@ -65,7 +65,7 @@ let FoldedCellHint = class FoldedCellHint extends CellContentPart {
         }
     }
     getHiddenCellsLabel(num) {
-        const label = num === 1 ? ( localize(12856, "1 cell hidden")) : ( localize(12857, "{0} cells hidden", num));
+        const label = num === 1 ? ( localize(14839, "1 cell hidden")) : ( localize(14840, "{0} cells hidden", num));
         return $("span.notebook-folded-hint-label", undefined, label);
     }
     getHiddenCellHintButton(element) {

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

@@ -229,8 +229,8 @@ let MarkupCell = class MarkupCell extends Disposable {
         expandIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.more));
         const keybinding = this.keybindingService.lookupKeybinding(EXPAND_CELL_INPUT_COMMAND_ID);
         if (keybinding) {
-            element.title = ( localize(12858, "Double-click to expand cell input ({0})", keybinding.getLabel()));
-            expandIcon.title = ( localize(12859, "Expand Cell Input ({0})", keybinding.getLabel()));
+            element.title = ( localize(14841, "Double-click to expand cell input ({0})", keybinding.getLabel()));
+            expandIcon.title = ( localize(14842, "Expand Cell Input ({0})", keybinding.getLabel()));
         }
         this.markdownAccessibilityContainer.ariaHidden = "true";
         this.templateData.container.classList.toggle("input-collapsed", true);

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

@@ -114,4 +114,4 @@ export interface ICoordinatesConverter {
     modelIndexIsVisible(modelIndex: number): boolean;
     convertModelIndexToViewIndex(modelIndex: number): number;
 }
-export declare const collapsedCellTTPolicy: Pick<TrustedTypePolicy, "name" | "createHTML"> | undefined;
+export declare const collapsedCellTTPolicy: Pick<TrustedTypePolicy, "createHTML" | "name"> | undefined;

package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.d.ts

@@ -25,6 +25,7 @@ import { INotebookService } from "../../../common/notebookService.service.js";
 import { IWebviewElement } from "../../../../webview/browser/webview.js";
 import { IWebviewService } from "../../../../webview/browser/webview.service.js";
 import { IEditorGroupsService } from "../../../../../services/editor/common/editorGroupsService.service.js";
+import { IEditorService } from "../../../../../services/editor/common/editorService.service.js";
 import { IWorkbenchEnvironmentService } from "../../../../../services/environment/common/environmentService.service.js";
 import { IPathService } from "../../../../../services/path/common/pathService.service.js";
 import { IAckOutputHeight, ICreationRequestMessage, IFindMatch, IMarkupCellInitialization } from "./webviewMessages.js";
@@ -115,6 +116,7 @@ export declare class BackLayerWebView<T extends ICommonCellInfo> extends Themabl
     private readonly languageService;
     private readonly workspaceContextService;
     private readonly editorGroupService;
+    private readonly editorService;
     private readonly storageService;
     private readonly pathService;
     private readonly notebookLogService;
@@ -139,7 +141,7 @@ export declare class BackLayerWebView<T extends ICommonCellInfo> extends Themabl
     private firstInit;
     private initializeMarkupPromise?;
     private readonly nonce;
-    constructor(notebookEditor: INotebookDelegateForWebview, id: string, notebookViewType: string, documentUri: URI, options: BacklayerWebviewOptions, rendererMessaging: IScopedRendererMessaging | undefined, webviewService: IWebviewService, openerService: IOpenerService, notebookService: INotebookService, contextService: IWorkspaceContextService, environmentService: IWorkbenchEnvironmentService, fileDialogService: IFileDialogService, fileService: IFileService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, workspaceTrustManagementService: IWorkspaceTrustManagementService, configurationService: IConfigurationService, languageService: ILanguageService, workspaceContextService: IWorkspaceContextService, editorGroupService: IEditorGroupsService, storageService: IStorageService, pathService: IPathService, notebookLogService: INotebookLoggingService, themeService: IThemeService, telemetryService: ITelemetryService);
+    constructor(notebookEditor: INotebookDelegateForWebview, id: string, notebookViewType: string, documentUri: URI, options: BacklayerWebviewOptions, rendererMessaging: IScopedRendererMessaging | undefined, webviewService: IWebviewService, openerService: IOpenerService, notebookService: INotebookService, contextService: IWorkspaceContextService, environmentService: IWorkbenchEnvironmentService, fileDialogService: IFileDialogService, fileService: IFileService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, workspaceTrustManagementService: IWorkspaceTrustManagementService, configurationService: IConfigurationService, languageService: ILanguageService, workspaceContextService: IWorkspaceContextService, editorGroupService: IEditorGroupsService, editorService: IEditorService, storageService: IStorageService, pathService: IPathService, notebookLogService: INotebookLoggingService, themeService: IThemeService, telemetryService: ITelemetryService);
     updateOptions(options: BacklayerWebviewOptions): void;
     private _logRendererDebugMessage;
     private _updateStyles;