@codingame/monaco-vscode-api 7.0.11 → 7.1.1

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

@@ -27,7 +27,7 @@ import { FontMeasurements } from '../../../../editor/browser/config/fontMeasurem
 import { BareFontInfo } from '../../../../editor/common/config/fontInfo.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
@@ -95,7 +95,6 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
 import { PreventDefaultContextMenuItemsContextKeyName } from '../../webview/browser/webview.contribution.js';
 import { NotebookAccessibilityProvider } from './notebookAccessibilityProvider.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/notebookEditorWidget";
 const $ = $$1;
 function getDefaultNotebookCreationOptions() {
     const skipContributions = [
@@ -2566,57 +2565,43 @@ const notebookCellBorder = registerColor('notebook.cellBorderColor', {
     light: ( (transparent(listInactiveSelectionBackground, 1))),
     hcDark: PANEL_BORDER,
     hcLight: PANEL_BORDER
-}, ( localizeWithPath(_moduleId, 0, "The border color for notebook cells.")));
-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', debugIconStartForeground, ( localizeWithPath(
-    _moduleId,
-    3,
+}, ( localize(7782, "The border color for notebook cells.")));
+registerColor('notebook.focusedEditorBorder', focusBorder, ( localize(7783, "The color of the notebook cell editor border.")));
+const cellStatusIconSuccess = registerColor('notebookStatusSuccessIcon.foreground', debugIconStartForeground, ( localize(7784, "The error icon color of notebook cells in the cell status bar.")));
+const runningCellRulerDecorationColor = registerColor('notebookEditorOverviewRuler.runningCellForeground', debugIconStartForeground, ( localize(
+    7785,
     "The color of the running cell decoration in the notebook editor overview ruler."
 )));
-const cellStatusIconError = registerColor('notebookStatusErrorIcon.foreground', errorForeground, ( localizeWithPath(
-    _moduleId,
-    4,
-    "The error icon color of notebook cells in the cell status bar."
-)));
-registerColor('notebookStatusRunningIcon.foreground', foreground, ( localizeWithPath(
-    _moduleId,
-    5,
-    "The running icon color of notebook cells in the cell status bar."
-)));
-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.")));
+const cellStatusIconError = registerColor('notebookStatusErrorIcon.foreground', errorForeground, ( localize(7786, "The error icon color of notebook cells in the cell status bar.")));
+registerColor('notebookStatusRunningIcon.foreground', foreground, ( localize(7787, "The running icon color of notebook cells in the cell status bar.")));
+registerColor('notebook.outputContainerBorderColor', null, ( localize(7788, "The border color of the notebook output container.")));
+registerColor('notebook.outputContainerBackgroundColor', null, ( localize(7789, "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', null, ( localizeWithPath(_moduleId, 9, "The background color of a cell when the cell is focused.")));
+}, ( localize(7790, "The color of the separator in the cell bottom toolbar")));
+const focusedCellBackground = registerColor('notebook.focusedCellBackground', null, ( localize(7791, "The background color of a cell when the cell is focused.")));
 registerColor('notebook.selectedCellBackground', {
     dark: listInactiveSelectionBackground,
     light: listInactiveSelectionBackground,
     hcDark: null,
     hcLight: null
-}, ( localizeWithPath(_moduleId, 10, "The background color of a cell when the cell is selected.")));
+}, ( localize(7792, "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
-}, ( localizeWithPath(_moduleId, 11, "The background color of a cell when the cell is hovered.")));
+}, ( localize(7793, "The background color of a cell when the cell is hovered.")));
 registerColor('notebook.selectedCellBorder', {
     dark: notebookCellBorder,
     light: notebookCellBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localizeWithPath(
-    _moduleId,
-    12,
+}, ( localize(
+    7794,
     "The color of the cell's top and bottom border when the cell is selected but not focused."
 )));
 registerColor('notebook.inactiveSelectedCellBorder', {
@@ -2624,19 +2609,13 @@ registerColor('notebook.inactiveSelectedCellBorder', {
     light: null,
     hcDark: focusBorder,
     hcLight: focusBorder
-}, ( localizeWithPath(
-    _moduleId,
-    13,
-    "The color of the cell's borders when multiple cells are selected."
-)));
-registerColor('notebook.focusedCellBorder', focusBorder, ( localizeWithPath(
-    _moduleId,
-    14,
+}, ( localize(7795, "The color of the cell's borders when multiple cells are selected.")));
+registerColor('notebook.focusedCellBorder', focusBorder, ( localize(
+    7796,
     "The color of the cell's focus indicator borders when the cell is focused."
 )));
-registerColor('notebook.inactiveFocusedCellBorder', notebookCellBorder, ( localizeWithPath(
-    _moduleId,
-    15,
+registerColor('notebook.inactiveFocusedCellBorder', notebookCellBorder, ( localize(
+    7797,
     "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', {
@@ -2644,31 +2623,27 @@ registerColor('notebook.cellStatusBarItemHoverBackground', {
     dark: ( (new Color( (new RGBA(255, 255, 255, 0.15))))),
     hcDark: ( (new Color( (new RGBA(255, 255, 255, 0.15))))),
     hcLight: ( (new Color( (new RGBA(0, 0, 0, 0.08))))),
-}, ( localizeWithPath(_moduleId, 16, "The background color of notebook cell status bar items.")));
-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."
-)));
+}, ( localize(7798, "The background color of notebook cell status bar items.")));
+registerColor('notebook.cellInsertionIndicator', focusBorder, ( localize(7799, "The color of the notebook cell insertion indicator.")));
+registerColor('notebookScrollbarSlider.background', scrollbarSliderBackground, ( localize(7800, "Notebook scrollbar slider background color.")));
+registerColor('notebookScrollbarSlider.hoverBackground', scrollbarSliderHoverBackground, ( localize(7801, "Notebook scrollbar slider background color when hovering.")));
+registerColor('notebookScrollbarSlider.activeBackground', scrollbarSliderActiveBackground, ( localize(7802, "Notebook scrollbar slider background color when clicked on.")));
 registerColor('notebook.symbolHighlightBackground', {
     dark: ( (Color.fromHex('#ffffff0b'))),
     light: ( (Color.fromHex('#fdff0033'))),
     hcDark: null,
     hcLight: null
-}, ( localizeWithPath(_moduleId, 21, "Background color of highlighted cell")));
+}, ( localize(7803, "Background color of highlighted cell")));
 registerColor('notebook.cellEditorBackground', {
     light: SIDE_BAR_BACKGROUND,
     dark: SIDE_BAR_BACKGROUND,
     hcDark: null,
     hcLight: null
-}, ( localizeWithPath(_moduleId, 22, "Cell editor background color.")));
+}, ( localize(7804, "Cell editor background color.")));
 const notebookEditorBackground = registerColor('notebook.editorBackground', {
     light: EDITOR_PANE_BACKGROUND,
     dark: EDITOR_PANE_BACKGROUND,
     hcDark: null,
     hcLight: null
-}, ( localizeWithPath(_moduleId, 23, "Notebook background color.")));
+}, ( localize(7805, "Notebook background color.")));
 export { NotebookEditorWidget, cellStatusIconError, cellStatusIconSuccess, focusedCellBackground, getDefaultNotebookCreationOptions, notebookCellBorder, runningCellRulerDecorationColor };

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

@@ -1,33 +1,32 @@
 import { Codicon } from '../../../../base/common/codicons.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 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 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.')));
+const selectKernelIcon = registerIcon('notebook-kernel-select', Codicon.serverEnvironment, ( localize(5648, 'Configure icon to select a kernel in notebook editors.')));
+const executeIcon = registerIcon('notebook-execute', Codicon.play, ( localize(5649, 'Icon to execute in notebook editors.')));
+const configIcon = registerIcon('notebook-config', Codicon.gear, ( localize(5650, 'Icon to configure in notebook editors.')));
+const executeAboveIcon = registerIcon('notebook-execute-above', Codicon.runAbove, ( localize(5651, 'Icon to execute above cells in notebook editors.')));
+const executeBelowIcon = registerIcon('notebook-execute-below', Codicon.runBelow, ( localize(5652, 'Icon to execute below cells in notebook editors.')));
+const stopIcon = registerIcon('notebook-stop', Codicon.primitiveSquare, ( localize(5653, 'Icon to stop an execution in notebook editors.')));
+const deleteCellIcon = registerIcon('notebook-delete-cell', Codicon.trash, ( localize(5654, 'Icon to delete a cell in notebook editors.')));
+const executeAllIcon = registerIcon('notebook-execute-all', Codicon.runAll, ( localize(5655, 'Icon to execute all cells in notebook editors.')));
+const editIcon = registerIcon('notebook-edit', Codicon.pencil, ( localize(5656, 'Icon to edit a cell in notebook editors.')));
+const stopEditIcon = registerIcon('notebook-stop-edit', Codicon.check, ( localize(5657, 'Icon to stop editing a cell in notebook editors.')));
+const moveUpIcon = registerIcon('notebook-move-up', Codicon.arrowUp, ( localize(5658, 'Icon to move up a cell in notebook editors.')));
+const moveDownIcon = registerIcon('notebook-move-down', Codicon.arrowDown, ( localize(5659, 'Icon to move down a cell in notebook editors.')));
+const clearIcon = registerIcon('notebook-clear', Codicon.clearAll, ( localize(5660, 'Icon to clear cell outputs in notebook editors.')));
+const splitCellIcon = registerIcon('notebook-split-cell', Codicon.splitVertical, ( localize(5661, 'Icon to split a cell in notebook editors.')));
+const successStateIcon = registerIcon('notebook-state-success', Codicon.check, ( localize(5662, 'Icon to indicate a success state in notebook editors.')));
+const errorStateIcon = registerIcon('notebook-state-error', Codicon.error, ( localize(5663, 'Icon to indicate an error state in notebook editors.')));
+const pendingStateIcon = registerIcon('notebook-state-pending', Codicon.clock, ( localize(5664, 'Icon to indicate a pending state in notebook editors.')));
+const executingStateIcon = registerIcon('notebook-state-executing', Codicon.sync, ( localize(5665, 'Icon to indicate an executing state in notebook editors.')));
+const collapsedIcon = registerIcon('notebook-collapsed', Codicon.chevronRight, ( localize(5666, 'Icon to annotate a collapsed section in notebook editors.')));
+const expandedIcon = registerIcon('notebook-expanded', Codicon.chevronDown, ( localize(5667, 'Icon to annotate an expanded section in notebook editors.')));
+const openAsTextIcon = registerIcon('notebook-open-as-text', Codicon.fileCode, ( localize(5668, 'Icon to open the notebook in a text editor.')));
+const revertIcon = registerIcon('notebook-revert', Codicon.discard, ( localize(5669, 'Icon to revert in notebook editors.')));
+const renderOutputIcon = registerIcon('notebook-render-output', Codicon.preview, ( localize(5670, 'Icon to render output in diff editor.')));
+const mimetypeIcon = registerIcon('notebook-mimetype', Codicon.code, ( localize(5671, 'Icon for a mime type in notebook editors.')));
+const copyIcon = registerIcon('notebook-copy', Codicon.copy, ( localize(5672, 'Icon to copy content to clipboard')));
+const previousChangeIcon = registerIcon('notebook-diff-editor-previous-change', Codicon.arrowUp, ( localize(5673, 'Icon for the previous change action in the diff editor.')));
+const nextChangeIcon = registerIcon('notebook-diff-editor-next-change', Codicon.arrowDown, ( localize(5674, 'Icon for the next change action in the diff editor.')));
+const variablesViewIcon = registerIcon('variables-view-icon', Codicon.debugAlt, ( localize(5675, '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/view/cellPart.js

@@ -4,7 +4,7 @@ import { Disposable, MutableDisposable, DisposableStore } from '../../../../../b
 class CellContentPart extends Disposable {
     constructor() {
         super();
-        this.cellDisposables = ( new DisposableStore());
+        this.cellDisposables = this._register(( new DisposableStore()));
     }
     prepareRenderCell(element) { }
     renderCell(element) {

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

@@ -9,7 +9,6 @@ import { IThemeService } from '../../../../../../platform/theme/common/themeServ
 import { ICommentService } from '../../../../comments/browser/commentService.service.js';
 import { CommentThreadWidget } from '../../../../comments/browser/commentThreadWidget.js';
 import { CellContentPart } from '../cellPart.js';
-import { CellKind } from '../../../common/notebookCommon.js';
 let CellComments = class CellComments extends CellContentPart {
     constructor(notebookEditor, container, contextKeyService, themeService, commentService, configurationService, instantiationService) {
         super();
@@ -46,7 +45,7 @@ let CellComments = class CellComments extends CellContentPart {
         await this._commentThreadWidget.value.display(layoutInfo.fontInfo.lineHeight, true);
         this._applyTheme();
         this._commentThreadDisposables.add(this._commentThreadWidget.value.onDidResize(() => {
-            if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget.value) {
+            if (this.currentElement && this._commentThreadWidget.value) {
                 this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.value.getDimensions().height);
             }
         }));
@@ -61,8 +60,7 @@ let CellComments = class CellComments extends CellContentPart {
         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.container.style.top = `${this.currentElement.layoutInfo.commentOffset}px`;
             this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.value.getDimensions().height);
             return;
         }
@@ -73,10 +71,6 @@ let CellComments = class CellComments extends CellContentPart {
                 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);
         }
@@ -93,8 +87,10 @@ let CellComments = class CellComments extends CellContentPart {
     async _getCommentThreadForCell(element) {
         if (this.notebookEditor.hasModel()) {
             const commentInfos = coalesce(await this.commentService.getNotebookComments(element.uri));
-            if (commentInfos.length && commentInfos[0].threads.length) {
-                return { owner: commentInfos[0].uniqueOwner, thread: commentInfos[0].threads[0] };
+            for (const commentInfo of commentInfos) {
+                for (const thread of commentInfo.threads) {
+                    return { owner: commentInfo.uniqueOwner, thread };
+                }
             }
         }
         return null;
@@ -105,20 +101,17 @@ let CellComments = class CellComments extends CellContentPart {
         this._commentThreadWidget.value?.applyTheme(theme, fontInfo);
     }
     didRenderCell(element) {
-        if (element.cellKind === CellKind.Code) {
-            this.initialize(element);
-            this._bindListeners();
-        }
+        this.initialize(element);
+        this._bindListeners();
     }
     prepareLayout() {
-        if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget.value) {
+        if (this.currentElement && this._commentThreadWidget.value) {
             this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.value.getDimensions().height);
         }
     }
     updateInternalLayoutNow(element) {
-        if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget.value) {
-            const layoutInfo = element.layoutInfo;
-            this.container.style.top = `${layoutInfo.outputContainerOffset + layoutInfo.outputTotalHeight}px`;
+        if (this.currentElement && this._commentThreadWidget.value) {
+            this.container.style.top = `${element.layoutInfo.commentOffset}px`;
         }
     }
 };

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

@@ -1,5 +1,5 @@
 import { Emitter } from '../../../../../../base/common/event.js';
-import { localizeWithPath, localize2WithPath } from '../../../../../../nls.js';
+import { localize, localize2 } from '../../../../../../nls.js';
 import { registerAction2, Action2, MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
 import { Extensions } from '../../../../../../platform/configuration/common/configurationRegistry.js';
@@ -10,7 +10,6 @@ import { NOTEBOOK_ACTIONS_CATEGORY, NotebookMultiCellAction } from '../../contro
 import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_LINE_NUMBERS } from '../../../common/notebookContextKeys.js';
 import { CellContentPart } from '../cellPart.js';
 import { NOTEBOOK_EDITOR_ID } from '../../../common/notebookCommon.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions";
 class CellEditorOptions extends CellContentPart {
     set tabSize(value) {
         if (this._tabSize !== value) {
@@ -142,7 +141,7 @@ class CellEditorOptions extends CellContentPart {
             type: 'string',
             enum: ['off', 'on'],
             default: 'off',
-            markdownDescription: ( localizeWithPath(_moduleId, 0, "Controls the display of line numbers in the cell editor."))
+            markdownDescription: ( localize(11382, "Controls the display of line numbers in the cell editor."))
         }
     }
 });
@@ -150,7 +149,7 @@ registerAction2(class ToggleLineNumberAction extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggleLineNumbers',
-            title: ( localize2WithPath(_moduleId, 1, 'Toggle Notebook Line Numbers')),
+            title: ( localize2(11383, 'Toggle Notebook Line Numbers')),
             precondition: NOTEBOOK_EDITOR_FOCUSED,
             menu: [
                 {
@@ -164,7 +163,7 @@ registerAction2(class ToggleLineNumberAction extends Action2 {
             f1: true,
             toggled: {
                 condition: ( (ContextKeyExpr.notEquals('config.notebook.lineNumbers', 'off'))),
-                title: ( localizeWithPath(_moduleId, 2, "Notebook Line Numbers")),
+                title: ( localize(11384, "Notebook Line Numbers")),
             }
         });
     }
@@ -183,7 +182,7 @@ registerAction2(class ToggleActiveLineNumberAction extends NotebookMultiCellActi
     constructor() {
         super({
             id: 'notebook.cell.toggleLineNumbers',
-            title: ( localizeWithPath(_moduleId, 3, "Show Cell Line Numbers")),
+            title: ( localize(11385, "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

@@ -4,7 +4,7 @@ import { renderMarkdown } from '../../../../../../base/browser/markdownRenderer.
 import { Action } from '../../../../../../base/common/actions.js';
 import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
-import { localizeWithPath } from '../../../../../../nls.js';
+import { localize } from '../../../../../../nls.js';
 import { createAndFillInActionBarActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { WorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
 import { MenuId } from '../../../../../../platform/actions/common/actions.js';
@@ -24,9 +24,14 @@ import { INotebookExecutionStateService } from '../../../common/notebookExecutio
 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 { CLEAR_CELL_OUTPUTS_COMMAND_ID } from '../../controller/editActions.js';
 import { TEXT_BASED_MIMETYPES } from '../../contrib/clipboard/cellOutputClipboard.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput";
+import { observableValue } from '../../../../../../base/common/observableInternal/base.js';
+import '../../../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../../../base/common/observableInternal/autorun.js';
+import '../../../../../../base/common/observableInternal/utils.js';
+import '../../../../../../base/common/cancellation.js';
+import '../../../../../../base/common/arrays.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) {
         super();
@@ -40,7 +45,8 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         this.menuService = menuService;
         this.paneCompositeService = paneCompositeService;
         this.instantiationService = instantiationService;
-        this._renderDisposableStore = this._register(( (new DisposableStore())));
+        this.toolbarDisposables = this._register(( (new DisposableStore())));
+        this.toolbarAttached = false;
         this._outputHeightTimer = null;
         this.contextKeyService = parentContextKeyService;
         this._register(this.output.model.onDidChangeData(() => {
@@ -95,7 +101,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         }
         else {
             const nextElement = this.innerContainer.nextElementSibling;
-            this._renderDisposableStore.clear();
+            this.toolbarDisposables.clear();
             const element = this.innerContainer;
             if (element) {
                 element.remove();
@@ -138,7 +144,22 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             renderer = this.notebookService.getRendererInfo('vscode.builtin-renderer');
         }
         const innerContainer = this._generateInnerOutputContainer(previousSibling, selectedPresentation);
-        this._attachToolbar(innerContainer, notebookTextModel, this.notebookEditor.activeKernel, index, mimeTypes);
+        if (index === 0 || this.output.visible.get()) {
+            this._attachToolbar(innerContainer, notebookTextModel, this.notebookEditor.activeKernel, index, mimeTypes);
+        }
+        else {
+            this._register(autorun((reader) => {
+                const visible = reader.readObservable(this.output.visible);
+                if (visible && !this.toolbarAttached) {
+                    this._attachToolbar(innerContainer, notebookTextModel, this.notebookEditor.activeKernel, index, mimeTypes);
+                }
+                else if (!visible) {
+                    this.toolbarDisposables.clear();
+                }
+                this.cellOutputContainer.checkForHiddenOutputs();
+            }));
+            this.cellOutputContainer.hasHiddenOutputs.set(true, undefined);
+        }
         this.renderedOutputContainer = append(innerContainer, $('.rendered-output'));
         this.renderResult = renderer
             ? { type: RenderOutputType.Extension, renderer, source: this.output, mimeType: selectedPresentation.mimeType }
@@ -154,14 +175,13 @@ let CellOutputElement = class CellOutputElement extends Disposable {
     }
     _renderMissingRenderer(viewModel, preferredMimeType) {
         if (!viewModel.model.outputs.length) {
-            return this._renderMessage(viewModel, ( localizeWithPath(_moduleId, 0, "Cell has no output")));
+            return this._renderMessage(viewModel, ( localize(11521, "Cell has no output")));
         }
         if (!preferredMimeType) {
             const mimeTypes = ( (viewModel.model.outputs.map(op => op.mime)));
             const mimeTypesMessage = mimeTypes.join(', ');
-            return this._renderMessage(viewModel, ( localizeWithPath(
-                _moduleId,
-                1,
+            return this._renderMessage(viewModel, ( localize(
+                11522,
                 "No renderer could be found for output. It has the following mimetypes: {0}",
                 mimeTypesMessage
             )));
@@ -205,11 +225,10 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         if (!this.notebookEditor.hasModel()) {
             return;
         }
-        const useConsolidatedButton = this.notebookEditor.notebookOptions.getDisplayOptions().consolidatedOutputButton;
         outputItemDiv.style.position = 'relative';
         const mimeTypePicker = $('.cell-output-toolbar');
         outputItemDiv.appendChild(mimeTypePicker);
-        const toolbar = this._renderDisposableStore.add(this.instantiationService.createInstance(WorkbenchToolBar, mimeTypePicker, {
+        const toolbar = this.toolbarDisposables.add(this.instantiationService.createInstance(WorkbenchToolBar, mimeTypePicker, {
             renderDropdownAsChildElement: false
         }));
         toolbar.context = {
@@ -219,16 +238,18 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             notebookEditor: this.notebookEditor,
             $mid: MarshalledId.NotebookCellActionContext
         };
-        const pickAction = ( (new Action('notebook.output.pickMimetype', ( localizeWithPath(_moduleId, 2, "Change Presentation")), ThemeIcon.asClassName(mimetypeIcon), undefined, async (_context) => this._pickActiveMimeTypeRenderer(outputItemDiv, notebookTextModel, kernel, this.output))));
-        const menu = this._renderDisposableStore.add(this.menuService.createMenu(MenuId.NotebookOutputToolbar, this.contextKeyService));
+        const pickAction = this.toolbarDisposables.add(( (new Action('notebook.output.pickMimetype', ( localize(11523, "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);
+        isFirstCellOutput.set(index === 0);
+        this.toolbarDisposables.add(autorun((reader) => { hasHiddenOutputs.set(reader.readObservable(this.cellOutputContainer.hasHiddenOutputs)); }));
+        const menu = this.toolbarDisposables.add(this.menuService.createMenu(MenuId.NotebookOutputToolbar, menuContextKeyService));
         const updateMenuToolbar = () => {
             const primary = [];
             let secondary = [];
             const result = { primary, secondary };
             createAndFillInActionBarActions(menu, { shouldForwardArgs: true }, result, () => false);
-            if (index > 0 || !useConsolidatedButton) {
-                secondary = secondary.filter((action) => action.id !== CLEAR_CELL_OUTPUTS_COMMAND_ID);
-            }
             if (!isCopyEnabled) {
                 secondary = secondary.filter((action) => action.id !== COPY_OUTPUT_COMMAND_ID);
             }
@@ -238,7 +259,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             toolbar.setActions([], secondary);
         };
         updateMenuToolbar();
-        this._renderDisposableStore.add(menu.onDidChange(updateMenuToolbar));
+        this.toolbarDisposables.add(menu.onDidChange(updateMenuToolbar));
     }
     async _pickActiveMimeTypeRenderer(outputItemDiv, notebookTextModel, kernel, viewModel) {
         const [mimeTypes, currIndex] = viewModel.resolveMimeTypes(notebookTextModel, kernel?.preloadProvides);
@@ -255,13 +276,13 @@ let CellOutputElement = class CellOutputElement extends Disposable {
                     index: index,
                     picked: index === currIndex,
                     detail: this._generateRendererInfo(mimeType.rendererId),
-                    description: index === currIndex ? ( localizeWithPath(_moduleId, 3, "Currently Active")) : undefined
+                    description: index === currIndex ? ( localize(11524, "Currently Active")) : undefined
                 });
             }
         });
         if (( (unsupportedItems.some(m => JUPYTER_RENDERER_MIMETYPES.includes(m.id))))) {
             unsupportedItems.push({
-                label: ( localizeWithPath(_moduleId, 4, "Install additional renderers from the marketplace")),
+                label: ( localize(11525, "Install additional renderers from the marketplace")),
                 id: 'installRenderers',
                 index: mimeTypes.length
             });
@@ -274,8 +295,8 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         ];
         picker.activeItems = items.filter(item => !!item.picked);
         picker.placeholder = items.length !== mimeTypes.length
-            ? ( localizeWithPath(_moduleId, 5, "Select mimetype to render for current output"))
-            : ( localizeWithPath(_moduleId, 6, "Select mimetype to render for current output"));
+            ? ( localize(11526, "Select mimetype to render for current output"))
+            : ( localize(11527, "Select mimetype to render for current output"));
         const pick = await ( (new Promise(resolve => {
             picker.onDidAccept(() => {
                 resolve(picker.selectedItems.length === 1 ? picker.selectedItems[0] : undefined);
@@ -291,7 +312,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             return;
         }
         const nextElement = outputItemDiv.nextElementSibling;
-        this._renderDisposableStore.clear();
+        this.toolbarDisposables.clear();
         const element = this.innerContainer;
         if (element) {
             element.remove();
@@ -316,7 +337,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             const displayName = renderInfo.displayName !== '' ? renderInfo.displayName : renderInfo.id;
             return `${displayName} (${renderInfo.extensionId.value})`;
         }
-        return ( localizeWithPath(_moduleId, 7, "renderer not available"));
+        return ( localize(11528, "renderer not available"));
     }
     _validateFinalOutputHeight(synchronous) {
         if (this._outputHeightTimer !== null) {
@@ -362,6 +383,14 @@ var CellOutputUpdateContext;
     CellOutputUpdateContext[CellOutputUpdateContext["Other"] = 2] = "Other";
 })(CellOutputUpdateContext || (CellOutputUpdateContext = {}))));
 let CellOutputContainer = class CellOutputContainer extends CellContentPart {
+    checkForHiddenOutputs() {
+        if (this._outputEntries.find(entry => { return entry.model.visible; })) {
+            this.hasHiddenOutputs.set(true, undefined);
+        }
+        else {
+            this.hasHiddenOutputs.set(false, undefined);
+        }
+    }
     get renderedOutputEntries() {
         return this._outputEntries;
     }
@@ -376,6 +405,7 @@ let CellOutputContainer = class CellOutputContainer extends CellContentPart {
         this.instantiationService = instantiationService;
         this._outputEntries = [];
         this._hasStaleOutputs = false;
+        this.hasHiddenOutputs = observableValue('hasHiddenOutputs', false);
         this._outputHeightTimer = null;
         this._register(viewCell.onDidStartExecution(() => {
             viewCell.updateOutputMinHeight(viewCell.layoutInfo.outputTotalHeight);

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

@@ -10,7 +10,7 @@ import { escape } from '../../../../../../base/common/strings.js';
 import { EditorOption } from '../../../../../../editor/common/config/editorOptions.js';
 import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
 import { tokenizeToStringSync } from '../../../../../../editor/common/languages/textToHtmlTokenizer.js';
-import { localizeWithPath } from '../../../../../../nls.js';
+import { localize } from '../../../../../../nls.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';
@@ -23,7 +23,6 @@ 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';
-const _moduleId = "vs/workbench/contrib/notebook/browser/view/cellParts/codeCell";
 let CodeCell = class CodeCell extends Disposable {
     constructor(notebookEditor, viewCell, templateData, instantiationService, keybindingService, openerService, languageService, configurationService, notebookExecutionStateService) {
         super();
@@ -347,13 +346,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 = ( localizeWithPath(
-                _moduleId,
-                0,
-                "Double-click to expand cell input ({0})",
-                keybinding.getLabel()
-            ));
-            expandIcon.title = ( localizeWithPath(_moduleId, 1, "Expand Cell Input ({0})", keybinding.getLabel()));
+            element.title = ( localize(11386, "Double-click to expand cell input ({0})", keybinding.getLabel()));
+            expandIcon.title = ( localize(11387, "Expand Cell Input ({0})", keybinding.getLabel()));
         }
         expandIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.more));
         element.appendChild(expandIcon);