@codingame/monaco-vscode-api 7.1.0 → 7.1.1

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

@@ -2,13 +2,12 @@ import { __decorate, __param } from '../../../../../../../../../external/tslib/t
 import { reset } from '../../../../../../base/browser/dom.js';
 import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { localizeWithPath } from '../../../../../../nls.js';
+import { localize } from '../../../../../../nls.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { successStateIcon, errorStateIcon, pendingStateIcon, executingStateIcon } from '../../notebookIcons.js';
 import { NotebookCellExecutionState } from '../../../common/notebookCommon.js';
 import { NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
 import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon";
 let CollapsedCodeCellExecutionIcon = class CollapsedCodeCellExecutionIcon extends Disposable {
     constructor(_notebookEditor, _cell, _element, _executionStateService) {
         super();
@@ -50,26 +49,26 @@ let CollapsedCodeCellExecutionIcon = class CollapsedCodeCellExecutionIcon extend
         if (!state && lastRunSuccess) {
             return {
                 text: `$(${successStateIcon.id})`,
-                tooltip: ( localizeWithPath(_moduleId, 0, "Success")),
+                tooltip: ( localize(11529, "Success")),
             };
         }
         else if (!state && lastRunSuccess === false) {
             return {
                 text: `$(${errorStateIcon.id})`,
-                tooltip: ( localizeWithPath(_moduleId, 1, "Failure")),
+                tooltip: ( localize(11530, "Failure")),
             };
         }
         else if (state === NotebookCellExecutionState.Pending || state === NotebookCellExecutionState.Unconfirmed) {
             return {
                 text: `$(${pendingStateIcon.id})`,
-                tooltip: ( localizeWithPath(_moduleId, 2, "Pending")),
+                tooltip: ( localize(11531, "Pending")),
             };
         }
         else if (state === NotebookCellExecutionState.Executing) {
             const icon = ThemeIcon.modify(executingStateIcon, 'spin');
             return {
                 text: `$(${icon.id})`,
-                tooltip: ( localizeWithPath(_moduleId, 3, "Executing")),
+                tooltip: ( localize(11532, "Executing")),
             };
         }
         return;

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

@@ -4,7 +4,7 @@ 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 { localizeWithPath } from '../../../../../../nls.js';
+import { localize } from '../../../../../../nls.js';
 import { DropdownWithPrimaryActionViewItem } from '../../../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
 import { createAndFillInActionBarActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
@@ -16,7 +16,6 @@ import { IKeybindingService } from '../../../../../../platform/keybinding/common
 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';
-const _moduleId = "vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar";
 let RunToolbar = class RunToolbar extends CellContentPart {
     constructor(notebookEditor, contextKeyService, cellContainer, runButtonContainer, menuService, keybindingService, contextMenuService, instantiationService) {
         super();
@@ -61,7 +60,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', ( localizeWithPath(_moduleId, 0, "More...")), 'codicon-chevron-down', true))));
+        const dropdownAction = this._register(( (new Action('notebook.moreRunActions', ( localize(11388, "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

@@ -2,29 +2,23 @@ import { __decorate, __param } from '../../../../../../../../../external/tslib/t
 import { append, hide, addDisposableListener, EventType, $ as $$1 } from '../../../../../../base/browser/dom.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
-import { localizeWithPath } from '../../../../../../nls.js';
+import { localize } from '../../../../../../nls.js';
 import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.service.js';
 import { EXPAND_CELL_OUTPUT_COMMAND_ID } from '../../notebookBrowser.js';
 import { CellContentPart } from '../cellPart.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput";
 const $ = $$1;
 let CollapsedCellOutput = class CollapsedCellOutput extends CellContentPart {
     constructor(notebookEditor, cellOutputCollapseContainer, keybindingService) {
         super();
         this.notebookEditor = notebookEditor;
         const placeholder = append(cellOutputCollapseContainer, $('span.expandOutputPlaceholder'));
-        placeholder.textContent = ( localizeWithPath(_moduleId, 0, "Outputs are collapsed"));
+        placeholder.textContent = ( localize(11389, "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 = ( localizeWithPath(
-                _moduleId,
-                1,
-                "Double-click to expand cell output ({0})",
-                keybinding.getLabel()
-            ));
-            cellOutputCollapseContainer.title = ( localizeWithPath(_moduleId, 2, "Expand Cell Output (${0})", keybinding.getLabel()));
+            placeholder.title = ( localize(11390, "Double-click to expand cell output ({0})", keybinding.getLabel()));
+            cellOutputCollapseContainer.title = ( localize(11391, "Expand Cell Output (${0})", keybinding.getLabel()));
         }
         hide(cellOutputCollapseContainer);
         this._register(addDisposableListener(expandIcon, EventType.CLICK, () => this.expand()));

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../../../external/tslib/t
 import { hide, reset, show, $, addDisposableListener, EventType } from '../../../../../../base/browser/dom.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
-import { localizeWithPath } from '../../../../../../nls.js';
+import { localize } from '../../../../../../nls.js';
 import { FoldingController } from '../../controller/foldingController.js';
 import { CellEditState, CellFoldingState } from '../../notebookBrowser.js';
 import { CellContentPart } from '../cellPart.js';
@@ -10,7 +10,6 @@ import { executingStateIcon } from '../../notebookIcons.js';
 import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
 import { CellKind, NotebookCellExecutionState } from '../../../common/notebookCommon.js';
 import { MutableDisposable } from '../../../../../../base/common/lifecycle.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint";
 let FoldedCellHint = class FoldedCellHint extends CellContentPart {
     constructor(_notebookEditor, _container, _notebookExecutionStateService) {
         super();
@@ -56,8 +55,8 @@ let FoldedCellHint = class FoldedCellHint extends CellContentPart {
     }
     getHiddenCellsLabel(num) {
         const label = num === 1 ?
-            ( localizeWithPath(_moduleId, 0, "1 cell hidden")) :
-            ( localizeWithPath(_moduleId, 1, "{0} cells hidden", num));
+            ( localize(11392, "1 cell hidden")) :
+            ( localize(11393, "{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

@@ -10,7 +10,7 @@ import { CodeEditorWidget } from '../../../../../../editor/browser/widget/codeEd
 import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.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 { IAccessibilityService } from '../../../../../../platform/accessibility/common/accessibility.service.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
@@ -21,7 +21,6 @@ import { CellEditState, CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, CellFolding
 import { expandedIcon, collapsedIcon } from '../../notebookIcons.js';
 import { CellEditorOptions } from './cellEditorOptions.js';
 import { WordHighlighterContribution } from '../../../../../../editor/contrib/wordHighlighter/browser/wordHighlighter.js';
-const _moduleId = "vs/workbench/contrib/notebook/browser/view/cellParts/markupCell";
 let MarkupCell = class MarkupCell extends Disposable {
     constructor(notebookEditor, viewCell, templateData, renderedEditors, accessibilityService, contextKeyService, instantiationService, languageService, configurationService, keybindingService) {
         super();
@@ -232,13 +231,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 = ( 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(11394, "Double-click to expand cell input ({0})", keybinding.getLabel()));
+            expandIcon.title = ( localize(11395, "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/renderers/backLayerWebView.js

@@ -16,7 +16,7 @@ import { TokenizationRegistry } from '../../../../../../editor/common/languages.
 import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
 import { generateTokensCSSForColorMap } from '../../../../../../editor/common/languages/supports/tokenization.js';
 import { tokenizeToString } from '../../../../../../editor/common/languages/textToHtmlTokenizer.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 { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
@@ -57,7 +57,6 @@ import { IEditorGroupsService } from '../../../../../services/editor/common/edit
 import { IWorkbenchEnvironmentService } from '../../../../../services/environment/common/environmentService.service.js';
 import { IPathService } from '../../../../../services/path/common/pathService.service.js';
 var BackLayerWebView_1;
-const _moduleId = "vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView";
 const LINE_COLUMN_REGEX = /:([\d]+)(?::([\d]+))?$/;
 const LineQueryRegex = /line=(\d+)$/;
 const FRAGMENT_REGEX = /^(.*)#([^#]*)$/;
@@ -184,9 +183,9 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
             'notebook-cell-output-line-height': `${this.options.outputLineHeight}px`,
             'notebook-cell-output-max-height': `${this.options.outputLineHeight * this.options.outputLineLimit + 2}px`,
             'notebook-cell-output-font-family': this.options.outputFontFamily || this.options.fontFamily,
-            'notebook-cell-markup-empty-content': ( localizeWithPath(_moduleId, 0, "Empty markdown cell, double-click or press enter to edit.")),
-            'notebook-cell-renderer-not-found-error': ( localizeWithPath(_moduleId, 1, "No renderer found for '$0'")),
-            'notebook-cell-renderer-fallbacks-exhausted': ( localizeWithPath(_moduleId, 2, "Could not render content for '$0'")),
+            'notebook-cell-markup-empty-content': ( localize(10668, "Empty markdown cell, double-click or press enter to edit.")),
+            'notebook-cell-renderer-not-found-error': ( localize(10669, "No renderer found for '$0'")),
+            'notebook-cell-renderer-fallbacks-exhausted': ( localize(10670, "Could not render content for '$0'")),
         };
     }
     generateContent(baseUrl) {
@@ -986,7 +985,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
         this.localResourceRootsCache = this._getResourceRootsCache();
         const webview = webviewService.createWebviewElement({
             origin: BackLayerWebView_1.getOriginStore(this.storageService).getOrigin(this.notebookViewType, undefined),
-            title: ( localizeWithPath(_moduleId, 3, "Notebook webview content")),
+            title: ( localize(10671, "Notebook webview content")),
             options: {
                 purpose: WebviewContentPurpose.NotebookRenderer,
                 enableFindWidget: false,

package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.js

@@ -7,7 +7,7 @@ import { CodeEditorWidget } from '../../../../../../editor/browser/widget/codeEd
 import { BareFontInfo } from '../../../../../../editor/common/config/fontInfo.js';
 import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../../../editor/common/languages/modesRegistry.js';
-import { localizeWithPath } from '../../../../../../nls.js';
+import { localize } from '../../../../../../nls.js';
 import { IMenuService } from '../../../../../../platform/actions/common/actions.service.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
@@ -39,7 +39,6 @@ import { MarkupCell } from '../cellParts/markupCell.js';
 import { CellKind } from '../../../common/notebookCommon.js';
 import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
 var MarkupCellRenderer_1, CodeCellRenderer_1;
-const _moduleId = "vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer";
 const $ = $$1;
 let NotebookCellListDelegate = class NotebookCellListDelegate extends Disposable {
     constructor(targetWindow, configurationService) {
@@ -229,7 +228,7 @@ let CodeCellRenderer = class CodeCellRenderer extends AbstractCellRenderer {
         const cellInputCollapsedContainer = append(cellContainer, $('.input-collapse-container'));
         cellInputCollapsedContainer.style.display = 'none';
         const executionOrderLabel = append(focusIndicatorLeft.domNode, $('div.execution-count-label'));
-        executionOrderLabel.title = ( localizeWithPath(_moduleId, 0, 'Execution Order'));
+        executionOrderLabel.title = ( localize(10672, 'Execution Order'));
         const editorPart = append(cellContainer, $('.cell-editor-part'));
         const editorContainer = append(editorPart, $('.cell-editor-container'));
         const cellCommentPartContainer = append(container, $('.cell-comment-container'));

package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.js

@@ -297,7 +297,7 @@ async function webviewPreloads(ctx) {
                     id,
                     height,
                     init: update.init,
-                    isOutput: update.isOutput,
+                    isOutput: update.isOutput
                 });
             }
             else {
@@ -318,6 +318,9 @@ async function webviewPreloads(ctx) {
             this.pending.clear();
         }
     });
+    function elementHasContent(height) {
+        return height > 2.1;
+    }
     const resizeObserver = new (class {
         constructor() {
             this._observedElements = ( new WeakMap());
@@ -341,22 +344,22 @@ async function webviewPreloads(ctx) {
                         this.updateHeight(observedElementInfo, entry.target.offsetHeight);
                         continue;
                     }
-                    const newHeight = entry.contentRect.height;
-                    const shouldUpdatePadding = (newHeight !== 0 && observedElementInfo.lastKnownPadding === 0) ||
-                        (newHeight === 0 && observedElementInfo.lastKnownPadding !== 0);
+                    const hasContent = elementHasContent(entry.contentRect.height);
+                    const shouldUpdatePadding = (hasContent && observedElementInfo.lastKnownPadding === 0) ||
+                        (!hasContent && observedElementInfo.lastKnownPadding !== 0);
                     if (shouldUpdatePadding) {
                         window.requestAnimationFrame(() => {
-                            if (newHeight !== 0) {
+                            if (hasContent) {
                                 entry.target.style.padding = `${ctx.style.outputNodePadding}px ${ctx.style.outputNodePadding}px ${ctx.style.outputNodePadding}px ${ctx.style.outputNodeLeftPadding}px`;
                             }
                             else {
                                 entry.target.style.padding = `0px`;
                             }
-                            this.updateHeight(observedElementInfo, entry.target.offsetHeight);
+                            this.updateHeight(observedElementInfo, hasContent ? entry.target.offsetHeight : 0);
                         });
                     }
                     else {
-                        this.updateHeight(observedElementInfo, entry.target.offsetHeight);
+                        this.updateHeight(observedElementInfo, hasContent ? entry.target.offsetHeight : 0);
                     }
                 }
             }));
@@ -2029,9 +2032,6 @@ async function webviewPreloads(ctx) {
             }
             this.element.style.visibility = '';
             this.element.style.top = `${top}px`;
-            dimensionUpdater.updateHeight(outputId, outputContainer.element.offsetHeight, {
-                isOutput: true,
-            });
         }
         hide() {
             this.element.style.visibility = 'hidden';
@@ -2166,15 +2166,24 @@ async function webviewPreloads(ctx) {
             }
             const offsetHeight = this.element.offsetHeight;
             const cps = document.defaultView.getComputedStyle(this.element);
-            if (offsetHeight !== 0 && cps.padding === '0px') {
+            const verticalPadding = parseFloat(cps.paddingTop) + parseFloat(cps.paddingBottom);
+            const contentHeight = offsetHeight - verticalPadding;
+            if (elementHasContent(contentHeight) && cps.padding === '0px') {
                 dimensionUpdater.updateHeight(this.outputId, offsetHeight + ctx.style.outputNodePadding * 2, {
                     isOutput: true,
-                    init: true,
+                    init: true
                 });
                 this.element.style.padding = `${ctx.style.outputNodePadding}px ${ctx.style.outputNodePadding}px ${ctx.style.outputNodePadding}px ${ctx.style.outputNodeLeftPadding}`;
             }
-            else {
+            else if (elementHasContent(contentHeight)) {
                 dimensionUpdater.updateHeight(this.outputId, this.element.offsetHeight, {
+                    isOutput: true,
+                    init: true
+                });
+                this.element.style.padding = `0 ${ctx.style.outputNodePadding}px 0 ${ctx.style.outputNodeLeftPadding}`;
+            }
+            else {
+                dimensionUpdater.updateHeight(this.outputId, 0, {
                     isOutput: true,
                     init: true,
                 });

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.js

@@ -87,6 +87,13 @@ class BaseCellViewModel extends Disposable {
         this._outputCollapsed = v;
         this._onDidChangeState.fire({ outputCollapsedChanged: true });
     }
+    set commentHeight(height) {
+        if (this._commentHeight === height) {
+            return;
+        }
+        this._commentHeight = height;
+        this.layoutChange({ commentHeight: true }, 'BaseCellViewModel#commentHeight');
+    }
     constructor(viewType, model, id, _viewContext, _configurationService, _modelService, _undoRedoService, _codeEditorService) {
         super();
         this.viewType = viewType;
@@ -120,6 +127,7 @@ class BaseCellViewModel extends Disposable {
         this._dragging = false;
         this._inputCollapsed = false;
         this._outputCollapsed = false;
+        this._commentHeight = 0;
         this._isDisposed = false;
         this._editStateSource = '';
         this._register(model.onDidChangeMetadata(() => {

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel.js

@@ -1,8 +1,23 @@
 import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../base/common/observableInternal/base.js';
+import '../../../../../base/common/observableInternal/derived.js';
+import '../../../../../base/common/observableInternal/autorun.js';
+import '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
+import '../../../../../base/common/arrays.js';
 import { RENDERER_NOT_AVAILABLE } from '../../common/notebookCommon.js';
 let handle = 0;
 class CellOutputViewModel extends Disposable {
+    setVisible(visible = true, force = false) {
+        if (!visible && this.alwaysShow) {
+            return;
+        }
+        if (force && visible) {
+            this.alwaysShow = true;
+        }
+        this.visible.set(visible, undefined);
+    }
     get model() {
         return this._outputRawData;
     }
@@ -19,6 +34,8 @@ class CellOutputViewModel extends Disposable {
         this._notebookService = _notebookService;
         this._onDidResetRendererEmitter = this._register(( new Emitter()));
         this.onDidResetRenderer = this._onDidResetRendererEmitter.event;
+        this.alwaysShow = false;
+        this.visible = observableValue('outputVisible', false);
         this.outputHandle = handle++;
     }
     hasMultiMimeType() {

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.js

@@ -41,13 +41,6 @@ let CodeCellViewModel = class CodeCellViewModel extends BaseCellViewModel {
     get chatHeight() {
         return this._chatHeight;
     }
-    set commentHeight(height) {
-        if (this._commentHeight === height) {
-            return;
-        }
-        this._commentHeight = height;
-        this.layoutChange({ commentHeight: true }, 'CodeCellViewModel#commentHeight');
-    }
     get outputIsHovered() {
         return this._hoveringOutput;
     }
@@ -101,7 +94,6 @@ let CodeCellViewModel = class CodeCellViewModel extends BaseCellViewModel {
         this.onDidChangeLayout = this._pauseableEmitter.event;
         this._editorHeight = 0;
         this._chatHeight = 0;
-        this._commentHeight = 0;
         this._hoveringOutput = false;
         this._focusOnOutput = false;
         this._focusInputInOutput = false;
@@ -137,6 +129,7 @@ let CodeCellViewModel = class CodeCellViewModel extends BaseCellViewModel {
                 : 0,
             chatHeight: 0,
             statusBarHeight: 0,
+            commentOffset: 0,
             commentHeight: 0,
             outputContainerOffset: 0,
             outputTotalHeight: 0,
@@ -225,11 +218,12 @@ let CodeCellViewModel = class CodeCellViewModel extends BaseCellViewModel {
                 editorHeight,
                 editorWidth,
                 statusBarHeight,
-                commentHeight,
                 outputContainerOffset,
                 outputTotalHeight,
                 outputShowMoreContainerHeight,
                 outputShowMoreContainerOffset,
+                commentOffset: outputContainerOffset + outputTotalHeight,
+                commentHeight,
                 totalHeight,
                 codeIndicatorHeight,
                 outputIndicatorHeight,
@@ -264,11 +258,12 @@ let CodeCellViewModel = class CodeCellViewModel extends BaseCellViewModel {
                 editorWidth,
                 chatHeight: chatHeight,
                 statusBarHeight: 0,
-                commentHeight,
                 outputContainerOffset,
                 outputTotalHeight,
                 outputShowMoreContainerHeight,
                 outputShowMoreContainerOffset,
+                commentOffset: outputContainerOffset + outputTotalHeight,
+                commentHeight,
                 totalHeight,
                 codeIndicatorHeight,
                 outputIndicatorHeight,
@@ -290,22 +285,9 @@ let CodeCellViewModel = class CodeCellViewModel extends BaseCellViewModel {
         super.restoreEditorViewState(editorViewStates);
         if (totalHeight !== undefined && this._layoutInfo.layoutState !== CellLayoutState.Measured) {
             this._layoutInfo = {
-                fontInfo: this._layoutInfo.fontInfo,
-                chatHeight: this._layoutInfo.chatHeight,
-                editorHeight: this._layoutInfo.editorHeight,
-                editorWidth: this._layoutInfo.editorWidth,
-                statusBarHeight: this.layoutInfo.statusBarHeight,
-                commentHeight: this.layoutInfo.commentHeight,
-                outputContainerOffset: this._layoutInfo.outputContainerOffset,
-                outputTotalHeight: this._layoutInfo.outputTotalHeight,
-                outputShowMoreContainerHeight: this._layoutInfo.outputShowMoreContainerHeight,
-                outputShowMoreContainerOffset: this._layoutInfo.outputShowMoreContainerOffset,
+                ...this._layoutInfo,
                 totalHeight: totalHeight,
-                codeIndicatorHeight: this._layoutInfo.codeIndicatorHeight,
-                outputIndicatorHeight: this._layoutInfo.outputIndicatorHeight,
-                bottomToolbarOffset: this._layoutInfo.bottomToolbarOffset,
                 layoutState: CellLayoutState.FromCache,
-                estimatedHasHorizontalScrolling: this._layoutInfo.estimatedHasHorizontalScrolling
             };
         }
     }
@@ -384,7 +366,13 @@ let CodeCellViewModel = class CodeCellViewModel extends BaseCellViewModel {
             throw ( new Error('Output index out of range!'));
         }
         this._ensureOutputsTop();
-        if (height < 28 && this._outputViewModels[index].hasMultiMimeType()) {
+        if (index === 0 || height > 0) {
+            this._outputViewModels[index].setVisible(true);
+        }
+        else if (height === 0) {
+            this._outputViewModels[index].setVisible(false);
+        }
+        if (this._outputViewModels[index].visible.get() && height < 28) {
             height = 28;
         }
         this._outputCollection[index] = height;

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.js

@@ -92,6 +92,8 @@ let MarkupCellViewModel = class MarkupCellViewModel extends BaseCellViewModel {
             editorWidth: initialNotebookLayoutInfo?.width
                 ? this.viewContext.notebookOptions.computeMarkdownCellEditorWidth(initialNotebookLayoutInfo.width)
                 : 0,
+            commentOffset: 0,
+            commentHeight: 0,
             bottomToolbarOffset: bottomToolbarGap,
             totalHeight: 100,
             layoutState: CellLayoutState.Uninitialized,
@@ -114,10 +116,11 @@ let MarkupCellViewModel = class MarkupCellViewModel extends BaseCellViewModel {
                 + layoutConfiguration.markdownCellTopMargin
                 + layoutConfiguration.markdownCellBottomMargin
                 + bottomToolbarGap
-                + this._statusBarHeight;
+                + this._statusBarHeight
+                + this._commentHeight;
         }
         else {
-            return Math.max(1, this._previewHeight + bottomToolbarGap + foldHintHeight);
+            return Math.max(1, this._previewHeight + bottomToolbarGap + foldHintHeight + this._commentHeight);
         }
     }
     _computeFoldHintHeight() {
@@ -143,63 +146,68 @@ let MarkupCellViewModel = class MarkupCellViewModel extends BaseCellViewModel {
         }
     }
     layoutChange(state) {
-        const foldHintHeight = this._computeFoldHintHeight();
+        let totalHeight;
+        let foldHintHeight;
         if (!this.isInputCollapsed) {
-            const editorWidth = state.outerWidth !== undefined
-                ? this.viewContext.notebookOptions.computeMarkdownCellEditorWidth(state.outerWidth)
-                : this._layoutInfo.editorWidth;
-            const totalHeight = state.totalHeight === undefined
-                ? (this._layoutInfo.layoutState === CellLayoutState.Uninitialized ? 100 : this._layoutInfo.totalHeight)
-                : state.totalHeight;
-            const previewHeight = this._previewHeight;
-            this._layoutInfo = {
-                fontInfo: state.font || this._layoutInfo.fontInfo,
-                editorWidth,
-                previewHeight,
-                chatHeight: this._chatHeight,
-                editorHeight: this._editorHeight,
-                statusBarHeight: this._statusBarHeight,
-                bottomToolbarOffset: this.viewContext.notebookOptions.computeBottomToolbarOffset(totalHeight, this.viewType),
-                totalHeight,
-                layoutState: CellLayoutState.Measured,
-                foldHintHeight
-            };
+            totalHeight = state.totalHeight === undefined ?
+                (this._layoutInfo.layoutState ===
+                    CellLayoutState.Uninitialized ?
+                    100 :
+                    this._layoutInfo.totalHeight) :
+                state.totalHeight;
+            foldHintHeight = this._computeFoldHintHeight();
         }
         else {
-            const editorWidth = state.outerWidth !== undefined
-                ? this.viewContext.notebookOptions.computeMarkdownCellEditorWidth(state.outerWidth)
-                : this._layoutInfo.editorWidth;
-            const totalHeight = this.viewContext.notebookOptions.computeCollapsedMarkdownCellHeight(this.viewType);
+            totalHeight =
+                this.viewContext.notebookOptions
+                    .computeCollapsedMarkdownCellHeight(this.viewType);
             state.totalHeight = totalHeight;
-            this._layoutInfo = {
-                fontInfo: state.font || this._layoutInfo.fontInfo,
-                editorWidth,
-                chatHeight: this._chatHeight,
-                editorHeight: this._editorHeight,
-                statusBarHeight: this._statusBarHeight,
-                previewHeight: this._previewHeight,
-                bottomToolbarOffset: this.viewContext.notebookOptions.computeBottomToolbarOffset(totalHeight, this.viewType),
-                totalHeight,
-                layoutState: CellLayoutState.Measured,
-                foldHintHeight: 0
-            };
+            foldHintHeight = 0;
+        }
+        let commentOffset;
+        if (this.getEditState() === CellEditState.Editing) {
+            const notebookLayoutConfiguration = this.viewContext.notebookOptions.getLayoutConfiguration();
+            commentOffset = notebookLayoutConfiguration.editorToolbarHeight
+                + notebookLayoutConfiguration.cellTopMargin
+                + this._chatHeight
+                + this._editorHeight
+                + this._statusBarHeight;
         }
+        else {
+            commentOffset = this._previewHeight;
+        }
+        this._layoutInfo = {
+            fontInfo: state.font || this._layoutInfo.fontInfo,
+            editorWidth: state.outerWidth !== undefined ?
+                this.viewContext.notebookOptions
+                    .computeMarkdownCellEditorWidth(state.outerWidth) :
+                this._layoutInfo.editorWidth,
+            chatHeight: this._chatHeight,
+            editorHeight: this._editorHeight,
+            statusBarHeight: this._statusBarHeight,
+            previewHeight: this._previewHeight,
+            bottomToolbarOffset: this.viewContext.notebookOptions
+                .computeBottomToolbarOffset(totalHeight, this.viewType),
+            totalHeight,
+            layoutState: CellLayoutState.Measured,
+            foldHintHeight,
+            commentOffset,
+            commentHeight: state.commentHeight ?
+                this._commentHeight :
+                this._layoutInfo.commentHeight,
+        };
         this._onDidChangeLayout.fire(state);
     }
     restoreEditorViewState(editorViewStates, totalHeight) {
         super.restoreEditorViewState(editorViewStates);
         if (totalHeight !== undefined && this.layoutInfo.layoutState === CellLayoutState.Uninitialized) {
             this._layoutInfo = {
-                fontInfo: this._layoutInfo.fontInfo,
-                editorWidth: this._layoutInfo.editorWidth,
-                previewHeight: this._layoutInfo.previewHeight,
-                bottomToolbarOffset: this._layoutInfo.bottomToolbarOffset,
+                ...this.layoutInfo,
                 totalHeight: totalHeight,
                 chatHeight: this._chatHeight,
                 editorHeight: this._editorHeight,
                 statusBarHeight: this._statusBarHeight,
                 layoutState: CellLayoutState.FromCache,
-                foldHintHeight: this._layoutInfo.foldHintHeight
             };
             this.layoutChange({});
         }

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.js

@@ -23,10 +23,10 @@ class NotebookStickyLine extends Disposable {
         this.header = header;
         this.entry = entry;
         this.notebookEditor = notebookEditor;
-        this._register(addDisposableListener(this.header, EventType.CLICK , () => {
+        this._register(addDisposableListener(this.header, EventType.CLICK, () => {
             this.focusCell();
         }));
-        this._register(addDisposableListener(this.foldingIcon.domNode, EventType.CLICK , () => {
+        this._register(addDisposableListener(this.foldingIcon.domNode, EventType.CLICK, () => {
             if (this.entry.cell.cellKind === CellKind.Markup) {
                 const currentFoldingState = this.entry.cell.foldingState;
                 this.toggleFoldRange(currentFoldingState);