@codingame/monaco-vscode-api 5.2.0 → 6.0.0

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

@@ -3,6 +3,7 @@ import { show, hide, $, append } from '../../../../../../base/browser/dom.js';
 import { renderMarkdown } from '../../../../../../base/browser/markdownRenderer.js';
 import { Action } from '../../../../../../base/common/actions.js';
 import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
 import { localizeWithPath } from '../../../../../../nls.js';
 import { createAndFillInActionBarActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { WorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
@@ -13,8 +14,9 @@ import { IInstantiationService } from '../../../../../../platform/instantiation/
 import { IOpenerService } from '../../../../../../platform/opener/common/opener.service.js';
 import { IQuickInputService } from '../../../../../../platform/quickinput/common/quickInput.service.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { ViewContainerLocation } from '../../../../../common/views.js';
 import { VIEWLET_ID } from '../../../../extensions/common/extensions.js';
-import { JUPYTER_EXTENSION_ID } from '../../notebookBrowser.js';
+import { RenderOutputType, JUPYTER_EXTENSION_ID } from '../../notebookBrowser.js';
 import { mimetypeIcon } from '../../notebookIcons.js';
 import { CellContentPart } from '../cellPart.js';
 import { NotebookCellExecutionState, CellUri, isTextStreamMime, RENDERER_NOT_AVAILABLE } from '../../../common/notebookCommon.js';
@@ -75,7 +77,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         if (this.notebookEditor.hasModel() &&
             this.innerContainer &&
             this.renderResult &&
-            this.renderResult.type === 1 ) {
+            this.renderResult.type === RenderOutputType.Extension) {
             const [mimeTypes, pick] = this.output.resolveMimeTypes(this.notebookEditor.textModel, this.notebookEditor.activeKernel?.preloadProvides);
             const pickedMimeType = mimeTypes[pick];
             if (pickedMimeType.mimeType === this.renderResult.mimeType && pickedMimeType.rendererId === this.renderResult.renderer.id) {
@@ -139,7 +141,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         this._attachToolbar(innerContainer, notebookTextModel, this.notebookEditor.activeKernel, index, mimeTypes);
         this.renderedOutputContainer = append(innerContainer, $('.rendered-output'));
         this.renderResult = renderer
-            ? { type: 1 , renderer, source: this.output, mimeType: selectedPresentation.mimeType }
+            ? { type: RenderOutputType.Extension, renderer, source: this.output, mimeType: selectedPresentation.mimeType }
             : this._renderMissingRenderer(this.output, selectedPresentation.mimeType);
         this.output.pickedMimeType = selectedPresentation;
         if (!this.renderResult) {
@@ -171,14 +173,14 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         const p = $('p', undefined, `No renderer could be found for mimetype "${mimeType}", but one might be available on the Marketplace.`);
         const a = $('a', { href: `command:workbench.extensions.search?%22${query}%22`, class: 'monaco-button monaco-text-button', tabindex: 0, role: 'button', style: 'padding: 8px; text-decoration: none; color: rgb(255, 255, 255); background-color: rgb(14, 99, 156); max-width: 200px;' }, `Search Marketplace`);
         return {
-            type: 0 ,
+            type: RenderOutputType.Html,
             source: viewModel,
             htmlContent: p.outerHTML + a.outerHTML
         };
     }
     _renderMessage(viewModel, message) {
         const el = $('p', undefined, message);
-        return { type: 0 , source: viewModel, htmlContent: el.outerHTML };
+        return { type: RenderOutputType.Html, source: viewModel, htmlContent: el.outerHTML };
     }
     shouldEnableCopy(mimeTypes) {
         if (!mimeTypes.find(mimeType => TEXT_BASED_MIMETYPES.indexOf(mimeType.mimeType) || mimeType.mimeType.startsWith('image/'))) {
@@ -215,7 +217,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             cell: this.output.cellViewModel,
             outputViewModel: this.output,
             notebookEditor: this.notebookEditor,
-            $mid: 13
+            $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));
@@ -304,7 +306,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         this._relayoutCell();
     }
     async _showJupyterExtension() {
-        const viewlet = await this.paneCompositeService.openPaneComposite(VIEWLET_ID, 0 , true);
+        const viewlet = await this.paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
         const view = viewlet?.getViewPaneContainer();
         view?.search(`@id:${JUPYTER_EXTENSION_ID}`);
     }
@@ -354,6 +356,11 @@ class OutputEntryViewHandler {
         this.element = element;
     }
 }
+var CellOutputUpdateContext;
+( ((function(CellOutputUpdateContext) {
+    CellOutputUpdateContext[CellOutputUpdateContext["Execution"] = 1] = "Execution";
+    CellOutputUpdateContext[CellOutputUpdateContext["Other"] = 2] = "Other";
+})(CellOutputUpdateContext || (CellOutputUpdateContext = {}))));
 let CellOutputContainer = class CellOutputContainer extends CellContentPart {
     get renderedOutputEntries() {
         return this._outputEntries;
@@ -378,7 +385,7 @@ let CellOutputContainer = class CellOutputContainer extends CellContentPart {
         }));
         this._register(viewCell.onDidChangeOutputs(splice => {
             const executionState = this._notebookExecutionStateService.getCellExecution(viewCell.uri);
-            const context = executionState ? 1  : 2 ;
+            const context = executionState ? CellOutputUpdateContext.Execution : CellOutputUpdateContext.Other;
             this._updateOutputs(splice, context);
         }));
         this._register(viewCell.onDidChangeLayout(() => {
@@ -475,7 +482,7 @@ let CellOutputContainer = class CellOutputContainer extends CellContentPart {
             }, 200);
         }
     }
-    _updateOutputs(splice, context = 2 ) {
+    _updateOutputs(splice, context = CellOutputUpdateContext.Other) {
         const previousOutputHeight = this.viewCell.layoutInfo.outputTotalHeight;
         this.viewCell.updateOutputMinHeight(previousOutputHeight);
         if (this.viewCell.outputsViewModels.length) {
@@ -583,7 +590,7 @@ let CellOutputContainer = class CellOutputContainer extends CellContentPart {
             hide(this.templateData.outputShowMoreContainer.domNode);
         }
         this._relayoutCell();
-        this._validateFinalOutputHeight(context === 2  && this.viewCell.outputsViewModels.length === 0);
+        this._validateFinalOutputHeight(context === CellOutputUpdateContext.Other && this.viewCell.outputsViewModels.length === 0);
     }
     _generateShowMoreElement(disposables) {
         const md = {

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

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

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

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

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

@@ -0,0 +1,7 @@
+var ClickTargetType;
+( (function(ClickTargetType) {
+    ClickTargetType[ClickTargetType["Container"] = 0] = "Container";
+    ClickTargetType[ClickTargetType["ContributedTextItem"] = 1] = "ContributedTextItem";
+    ClickTargetType[ClickTargetType["ContributedCommandItem"] = 2] = "ContributedCommandItem";
+})(ClickTargetType || (ClickTargetType = {})));
+export { ClickTargetType };

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

@@ -7,6 +7,7 @@ import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
 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';
@@ -153,6 +154,9 @@ let CodeCell = class CodeCell extends Disposable {
             if (model && this.templateData.editor) {
                 this._reigsterModelListeners(model);
                 this.templateData.editor.setModel(model);
+                if (this._isDisposed) {
+                    return;
+                }
                 model.updateOptions({
                     indentSize: this._cellEditorOptions.indentSize,
                     tabSize: this._cellEditorOptions.tabSize,
@@ -172,6 +176,9 @@ let CodeCell = class CodeCell extends Disposable {
                 if (realContentHeight !== undefined && realContentHeight !== initEditorHeight) {
                     this.onCellEditorHeightChange(realContentHeight);
                 }
+                if (this._isDisposed) {
+                    return;
+                }
                 focusEditorIfNeeded();
             }
             this._register(this._cellEditorOptions.onDidChange(() => this.updateCodeCellOptions(this.templateData)));
@@ -188,7 +195,7 @@ let CodeCell = class CodeCell extends Disposable {
         const isReadonly = this.notebookEditor.isReadOnly;
         const padding = this.notebookEditor.notebookOptions.computeEditorPadding(this.viewCell.internalMetadata, this.viewCell.uri);
         const options = editor.getOptions();
-        if (options.get(91 ) !== isReadonly || options.get(84 ) !== padding) {
+        if (options.get(EditorOption.readOnly) !== isReadonly || options.get(EditorOption.padding) !== padding) {
             editor.updateOptions({ readOnly: this.notebookEditor.isReadOnly, padding: this.notebookEditor.notebookOptions.computeEditorPadding(this.viewCell.internalMetadata, this.viewCell.uri) });
         }
     }
@@ -220,6 +227,9 @@ let CodeCell = class CodeCell extends Disposable {
                 const layoutContentHeight = this.viewCell.layoutInfo.editorHeight;
                 if (contentHeight !== layoutContentHeight) {
                     this.onCellEditorHeightChange(contentHeight);
+                    if (this._isDisposed) {
+                        return;
+                    }
                 }
                 const lastSelection = selections[selections.length - 1];
                 this.notebookEditor.revealRangeInViewAsync(this.viewCell, lastSelection);

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

@@ -2,6 +2,7 @@ import { __decorate, __param } from '../../../../../../../../../external/tslib/t
 import { ToolBar } from '../../../../../../base/browser/ui/toolbar/toolbar.js';
 import { Action } from '../../../../../../base/common/actions.js';
 import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
 import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.js';
 import { localizeWithPath } from '../../../../../../nls.js';
 import { DropdownWithPrimaryActionViewItem } from '../../../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
@@ -45,7 +46,7 @@ let RunToolbar = class RunToolbar extends CellContentPart {
             ui: true,
             cell: element,
             notebookEditor: this.notebookEditor,
-            $mid: 13
+            $mid: MarshalledId.NotebookCellActionContext
         };
     }
     getCellToolbarActions(menu) {

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

@@ -4,11 +4,11 @@ import { Codicon } from '../../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { localizeWithPath } from '../../../../../../nls.js';
 import { FoldingController } from '../../controller/foldingController.js';
-import { CellEditState } from '../../notebookBrowser.js';
+import { CellEditState, CellFoldingState } from '../../notebookBrowser.js';
 import { CellContentPart } from '../cellPart.js';
 import { executingStateIcon } from '../../notebookIcons.js';
 import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
-import { NotebookCellExecutionState } from '../../../common/notebookCommon.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 {
@@ -34,10 +34,16 @@ let FoldedCellHint = class FoldedCellHint extends CellContentPart {
             this._runButtonListener.clear();
             hide(this._container);
         }
-        else if (element.foldingState === 2 ) {
+        else if (element.foldingState === CellFoldingState.Collapsed) {
             const idx = this._notebookEditor.getViewModel().getCellIndex(element);
             const length = this._notebookEditor.getViewModel().getFoldedLength(idx);
-            reset(this._container, this.getRunFoldedSectionButton({ start: idx, end: idx + length + 1 }), this.getHiddenCellsLabel(length), this.getHiddenCellHintButton(element));
+            const runSectionButton = this.getRunFoldedSectionButton({ start: idx, end: idx + length + 1 });
+            if (!runSectionButton) {
+                reset(this._container, this.getHiddenCellsLabel(length), this.getHiddenCellHintButton(element));
+            }
+            else {
+                reset(this._container, runSectionButton, this.getHiddenCellsLabel(length), this.getHiddenCellHintButton(element));
+            }
             show(this._container);
             const foldHintTop = element.layoutInfo.previewHeight;
             this._container.style.top = `${foldHintTop}px`;
@@ -61,7 +67,7 @@ let FoldedCellHint = class FoldedCellHint extends CellContentPart {
             const controller = this._notebookEditor.getContribution(FoldingController.id);
             const idx = this._notebookEditor.getCellIndex(element);
             if (typeof idx === 'number') {
-                controller.setFoldingStateDown(idx, 1 , 1);
+                controller.setFoldingStateDown(idx, CellFoldingState.Expanded, 1);
             }
         }));
         return expandIcon;
@@ -69,6 +75,10 @@ let FoldedCellHint = class FoldedCellHint extends CellContentPart {
     getRunFoldedSectionButton(range) {
         const runAllContainer = $('span.folded-cell-run-section-button');
         const cells = this._notebookEditor.getCellsInRange(range);
+        const hasCodeCells = ( (cells.some(cell => cell.cellKind === CellKind.Code)));
+        if (!hasCodeCells) {
+            return undefined;
+        }
         const isRunning = ( (cells.some(cell => {
             const cellExecution = this._notebookExecutionStateService.getCellExecution(cell.uri);
             return cellExecution && cellExecution.state === NotebookCellExecutionState.Executing;

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

@@ -17,7 +17,7 @@ import { IContextKeyService } from '../../../../../../platform/contextkey/common
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../../../platform/instantiation/common/serviceCollection.js';
 import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.service.js';
-import { CellEditState, CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID } from '../../notebookBrowser.js';
+import { CellEditState, CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, CellFoldingState } from '../../notebookBrowser.js';
 import { expandedIcon, collapsedIcon } from '../../notebookIcons.js';
 import { CellEditorOptions } from './cellEditorOptions.js';
 import { WordHighlighterContribution } from '../../../../../../editor/contrib/wordHighlighter/browser/wordHighlighter.js';
@@ -176,17 +176,20 @@ let MarkupCell = class MarkupCell extends Disposable {
             e.added.forEach(options => {
                 if (options.className) {
                     this.notebookEditor.deltaCellContainerClassNames(this.viewCell.id, [options.className], []);
+                    this.templateData.rootContainer.classList.add(options.className);
                 }
             });
             e.removed.forEach(options => {
                 if (options.className) {
                     this.notebookEditor.deltaCellContainerClassNames(this.viewCell.id, [], [options.className]);
+                    this.templateData.rootContainer.classList.remove(options.className);
                 }
             });
         }));
         this.viewCell.getCellDecorations().forEach(options => {
             if (options.className) {
                 this.notebookEditor.deltaCellContainerClassNames(this.viewCell.id, [options.className], []);
+                this.templateData.rootContainer.classList.add(options.className);
             }
         });
     }
@@ -380,15 +383,15 @@ let MarkupCell = class MarkupCell extends Disposable {
     }
     layoutFoldingIndicator() {
         switch (this.foldingState) {
-            case 0 :
+            case CellFoldingState.None:
                 this.templateData.foldingIndicator.style.display = 'none';
                 this.templateData.foldingIndicator.innerText = '';
                 break;
-            case 2 :
+            case CellFoldingState.Collapsed:
                 this.templateData.foldingIndicator.style.display = '';
                 reset(this.templateData.foldingIndicator, renderIcon(collapsedIcon));
                 break;
-            case 1 :
+            case CellFoldingState.Expanded:
                 this.templateData.foldingIndicator.style.display = '';
                 reset(this.templateData.foldingIndicator, renderIcon(expandedIcon));
                 break;

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

@@ -4,11 +4,12 @@ import { ListError } from '../../../../../base/browser/ui/list/list.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
 import { DisposableStore, MutableDisposable, Disposable } from '../../../../../base/common/lifecycle.js';
 import { isMacintosh } from '../../../../../base/common/platform.js';
+import { TrackedRangeStickiness } from '../../../../../editor/common/model.js';
 import { PrefixSumComputer } from '../../../../../editor/common/model/prefixSumComputer.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
 import { WorkbenchList } from '../../../../../platform/list/browser/listService.js';
 import { IListService } from '../../../../../platform/list/browser/listService.service.js';
-import { CellEditState, CellFocusMode, CellRevealRangeType, CursorAtBoundary, CursorAtLineBoundary } from '../notebookBrowser.js';
+import { CellEditState, CellFocusMode, CellRevealType, CellRevealRangeType, CursorAtBoundary, CursorAtLineBoundary } from '../notebookBrowser.js';
 import { NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY, CellKind, diff, SelectionStateType } from '../../common/notebookCommon.js';
 import { cellRangesEqual, reduceCellRanges, cellRangesToIndexes } from '../../common/notebookRange.js';
 import { NOTEBOOK_CELL_LIST_FOCUSED } from '../../common/notebookContextKeys.js';
@@ -20,6 +21,13 @@ import { NotebookCellListView } from './notebookCellListView.js';
 import { INotebookExecutionStateService } from '../../common/notebookExecutionStateService.service.js';
 import { NotebookCellAnchor } from './notebookCellAnchor.js';
 import { NotebookViewZones } from '../viewParts/notebookViewZones.js';
+var CellRevealPosition;
+( (function(CellRevealPosition) {
+    CellRevealPosition[CellRevealPosition["Top"] = 0] = "Top";
+    CellRevealPosition[CellRevealPosition["Center"] = 1] = "Center";
+    CellRevealPosition[CellRevealPosition["Bottom"] = 2] = "Bottom";
+    CellRevealPosition[CellRevealPosition["NearTop"] = 3] = "NearTop";
+})(CellRevealPosition || (CellRevealPosition = {})));
 function getVisibleCells(cells, hiddenRanges) {
     if (!hiddenRanges.length) {
         return cells;
@@ -217,6 +225,9 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
         this.viewZones = ( new NotebookViewZones(listView, this));
         return listView;
     }
+    _getView() {
+        return this.view;
+    }
     attachWebview(element) {
         element.style.top = `-${NOTEBOOK_WEBVIEW_BOUNDARY}px`;
         this.rowsContainer.insertAdjacentElement('afterbegin', element);
@@ -343,9 +354,9 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
                 return false;
             }
         }
-        this._hiddenRangeIds.forEach(id => this._viewModel.setTrackedRange(id, null, 3 ));
+        this._hiddenRangeIds.forEach(id => this._viewModel.setTrackedRange(id, null, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter));
         const hiddenAreaIds = ( newRanges.map(
-            range => this._viewModel.setTrackedRange(null, range, 3 )
+            range => this._viewModel.setTrackedRange(null, range, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter)
         )).filter(id => id !== null);
         this._hiddenRangeIds = hiddenAreaIds;
         this._updateHiddenRangePrefixSum(newRanges);
@@ -655,14 +666,14 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
                 return;
             }
             if (endElementTop >= wrapperBottom) {
-                return this._revealInternal(endIndex, false, 2 );
+                return this._revealInternal(endIndex, false, CellRevealPosition.Bottom);
             }
             if (endElementTop < wrapperBottom) {
                 if (endElementTop + endElementHeight - wrapperBottom < elementTop - scrollTop) {
                     return this.view.setScrollTop(scrollTop + endElementTop + endElementHeight - wrapperBottom);
                 }
                 else {
-                    return this._revealInternal(startIndex, false, 0 );
+                    return this._revealInternal(startIndex, false, CellRevealPosition.Top);
                 }
             }
         }
@@ -672,10 +683,10 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
         const firstIndex = this.view.firstMostlyVisibleIndex;
         const elementHeight = this.view.elementHeight(viewIndex);
         if (viewIndex <= firstIndex || (!firstLine && elementHeight >= this.view.renderHeight)) {
-            this._revealInternal(viewIndex, true, 0 );
+            this._revealInternal(viewIndex, true, CellRevealPosition.Top);
         }
         else {
-            this._revealInternal(viewIndex, true, 2 , firstLine);
+            this._revealInternal(viewIndex, true, CellRevealPosition.Bottom, firstLine);
         }
     }
     scrollToBottom() {
@@ -690,28 +701,28 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
             return;
         }
         switch (revealType) {
-            case 2 :
-                this._revealInternal(index, false, 0 );
+            case CellRevealType.Top:
+                this._revealInternal(index, false, CellRevealPosition.Top);
                 break;
-            case 3 :
-                this._revealInternal(index, false, 1 );
+            case CellRevealType.Center:
+                this._revealInternal(index, false, CellRevealPosition.Center);
                 break;
-            case 4 :
-                this._revealInternal(index, true, 1 );
+            case CellRevealType.CenterIfOutsideViewport:
+                this._revealInternal(index, true, CellRevealPosition.Center);
                 break;
-            case 5 :
-                this._revealInternal(index, true, 3 );
+            case CellRevealType.NearTopIfOutsideViewport:
+                this._revealInternal(index, true, CellRevealPosition.NearTop);
                 break;
-            case 6 :
+            case CellRevealType.FirstLineIfOutsideViewport:
                 this._revealInViewWithMinimalScrolling(index, true);
                 break;
-            case 1 :
+            case CellRevealType.Default:
                 this._revealInViewWithMinimalScrolling(index);
                 break;
         }
         if ((
         (
-        cell.getEditState() === CellEditState.Editing || (revealType === 6  && cell.cellKind === CellKind.Code))) && !cell.editorAttached) {
+        cell.getEditState() === CellEditState.Editing || (revealType === CellRevealType.FirstLineIfOutsideViewport && cell.cellKind === CellKind.Code))) && !cell.editorAttached) {
             return getEditorAttachedPromise(cell);
         }
         return;
@@ -730,12 +741,12 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
             }
         }
         switch (revealPosition) {
-            case 0 :
+            case CellRevealPosition.Top:
                 this.view.setScrollTop(elementTop);
                 this.view.setScrollTop(this.view.elementTop(viewIndex));
                 break;
-            case 1 :
-            case 3 :
+            case CellRevealPosition.Center:
+            case CellRevealPosition.NearTop:
                 {
                     this.view.setScrollTop(elementTop - this.view.renderHeight / 2);
                     const newElementTop = this.view.elementTop(viewIndex);
@@ -744,15 +755,15 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
                     if (newElementHeight >= renderHeight) {
                         this.view.setScrollTop(newElementTop);
                     }
-                    else if (revealPosition === 1 ) {
+                    else if (revealPosition === CellRevealPosition.Center) {
                         this.view.setScrollTop(newElementTop + (newElementHeight / 2) - (renderHeight / 2));
                     }
-                    else if (revealPosition === 3 ) {
+                    else if (revealPosition === CellRevealPosition.NearTop) {
                         this.view.setScrollTop(newElementTop - (renderHeight / 5));
                     }
                 }
                 break;
-            case 2 :
+            case CellRevealPosition.Bottom:
                 if (firstLine) {
                     const lineHeight = this.viewModel?.layoutInfo?.fontInfo.lineHeight ?? 15;
                     const padding = this.notebookOptions.getLayoutConfiguration().cellTopMargin + this.notebookOptions.getLayoutConfiguration().editorTopPadding;
@@ -910,7 +921,7 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
         }
     }
     _revealInCenterIfOutsideViewport(viewIndex) {
-        this._revealInternal(viewIndex, true, 1 );
+        this._revealInternal(viewIndex, true, CellRevealPosition.Center);
     }
     domElementOfElement(element) {
         const index = this._getViewIndexUpperBound(element);

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

@@ -131,7 +131,7 @@ class NotebookCellsLayout {
         const index = afterPosition - 1;
         const previousItemPosition = this._prefixSumComputer.getPrefixSum(index);
         const previousItemSize = this._items[index].size;
-        const previousWhitespace = this._whitespace.filter(ws => ws.afterPosition === afterPosition - 1);
+        const previousWhitespace = this._whitespace.filter(ws => (ws.afterPosition <= afterPosition - 1 && ws.afterPosition > 0));
         const whitespaceBefore = previousWhitespace.reduce((acc, ws) => acc + ws.size, 0);
         return previousItemPosition + previousItemSize + whitespaceBeforeFirstItem + this.paddingTop + whitespaceBefore;
     }
@@ -214,8 +214,19 @@ class NotebookCellListView extends ListView {
         return id;
     }
     changeOneWhitespace(id, newAfterPosition, newSize) {
-        this.notebookRangeMap.changeOneWhitespace(id, newAfterPosition, newSize);
-        this.eventuallyUpdateScrollDimensions();
+        const scrollTop = this.scrollTop;
+        const previousRenderRange = this.getRenderRange(this.lastRenderTop, this.lastRenderHeight);
+        const currentPosition = this.notebookRangeMap.getWhitespacePosition(id);
+        if (currentPosition > scrollTop) {
+            this.notebookRangeMap.changeOneWhitespace(id, newAfterPosition, newSize);
+            this.render(previousRenderRange, scrollTop, this.lastRenderHeight, undefined, undefined, false);
+            this._rerender(scrollTop, this.renderHeight, false);
+            this.eventuallyUpdateScrollDimensions();
+        }
+        else {
+            this.notebookRangeMap.changeOneWhitespace(id, newAfterPosition, newSize);
+            this.eventuallyUpdateScrollDimensions();
+        }
     }
     removeWhitespace(id) {
         const scrollTop = this.scrollTop;