@codingame/monaco-vscode-api 9.0.2 → 10.0.0

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

@@ -4,7 +4,7 @@ import { Codicon } from '../../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { localize } from '../../../../../../nls.js';
 import { FoldingController } from '../../controller/foldingController.js';
-import { CellEditState, CellFoldingState } from '../../notebookBrowser.js';
+import { CellEditState } from '../../notebookBrowser.js';
 import { CellContentPart } from '../cellPart.js';
 import { executingStateIcon } from '../../notebookIcons.js';
 import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
@@ -33,7 +33,7 @@ let FoldedCellHint = class FoldedCellHint extends CellContentPart {
             this._runButtonListener.clear();
             hide(this._container);
         }
-        else if (element.foldingState === CellFoldingState.Collapsed) {
+        else if (element.foldingState === 2 ) {
             const idx = this._notebookEditor.getViewModel().getCellIndex(element);
             const length = this._notebookEditor.getViewModel().getFoldedLength(idx);
             const runSectionButton = this.getRunFoldedSectionButton({ start: idx, end: idx + length + 1 });
@@ -55,8 +55,8 @@ let FoldedCellHint = class FoldedCellHint extends CellContentPart {
     }
     getHiddenCellsLabel(num) {
         const label = num === 1 ?
-            ( localize(11469, "1 cell hidden")) :
-            ( localize(11470, "{0} cells hidden", num));
+            ( localize(11612, "1 cell hidden")) :
+            ( localize(11613, "{0} cells hidden", num));
         return $('span.notebook-folded-hint-label', undefined, label);
     }
     getHiddenCellHintButton(element) {
@@ -66,7 +66,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, CellFoldingState.Expanded, 1);
+                controller.setFoldingStateDown(idx, 1 , 1);
             }
         }));
         return expandIcon;

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, CellFoldingState } from '../../notebookBrowser.js';
+import { CellEditState, CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID } from '../../notebookBrowser.js';
 import { expandedIcon, collapsedIcon } from '../../notebookIcons.js';
 import { CellEditorOptions } from './cellEditorOptions.js';
 import { WordHighlighterContribution } from '../../../../../../editor/contrib/wordHighlighter/browser/wordHighlighter.js';
@@ -231,8 +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 = ( localize(11471, "Double-click to expand cell input ({0})", keybinding.getLabel()));
-            expandIcon.title = ( localize(11472, "Expand Cell Input ({0})", keybinding.getLabel()));
+            element.title = ( localize(11614, "Double-click to expand cell input ({0})", keybinding.getLabel()));
+            expandIcon.title = ( localize(11615, "Expand Cell Input ({0})", keybinding.getLabel()));
         }
         this.markdownAccessibilityContainer.ariaHidden = 'true';
         this.templateData.container.classList.toggle('input-collapsed', true);
@@ -377,15 +377,15 @@ let MarkupCell = class MarkupCell extends Disposable {
     }
     layoutFoldingIndicator() {
         switch (this.foldingState) {
-            case CellFoldingState.None:
+            case 0 :
                 this.templateData.foldingIndicator.style.display = 'none';
                 this.templateData.foldingIndicator.innerText = '';
                 break;
-            case CellFoldingState.Collapsed:
+            case 2 :
                 this.templateData.foldingIndicator.style.display = '';
                 reset(this.templateData.foldingIndicator, renderIcon(collapsedIcon));
                 break;
-            case CellFoldingState.Expanded:
+            case 1 :
                 this.templateData.foldingIndicator.style.display = '';
                 reset(this.templateData.foldingIndicator, renderIcon(expandedIcon));
                 break;

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

@@ -4,12 +4,11 @@ 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, CellRevealType, CellRevealRangeType, CursorAtBoundary, CursorAtLineBoundary } from '../notebookBrowser.js';
+import { CellEditState, CellFocusMode, 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';
@@ -21,13 +20,6 @@ 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;
@@ -354,9 +346,9 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
                 return false;
             }
         }
-        this._hiddenRangeIds.forEach(id => this._viewModel.setTrackedRange(id, null, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter));
+        this._hiddenRangeIds.forEach(id => this._viewModel.setTrackedRange(id, null, 3 ));
         const hiddenAreaIds = ( newRanges.map(
-            range => this._viewModel.setTrackedRange(null, range, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter)
+            range => this._viewModel.setTrackedRange(null, range, 3 )
         )).filter(id => id !== null);
         this._hiddenRangeIds = hiddenAreaIds;
         this._updateHiddenRangePrefixSum(newRanges);
@@ -666,14 +658,14 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
                 return;
             }
             if (endElementTop >= wrapperBottom) {
-                return this._revealInternal(endIndex, false, CellRevealPosition.Bottom);
+                return this._revealInternal(endIndex, false, 2 );
             }
             if (endElementTop < wrapperBottom) {
                 if (endElementTop + endElementHeight - wrapperBottom < elementTop - scrollTop) {
                     return this.view.setScrollTop(scrollTop + endElementTop + endElementHeight - wrapperBottom);
                 }
                 else {
-                    return this._revealInternal(startIndex, false, CellRevealPosition.Top);
+                    return this._revealInternal(startIndex, false, 0 );
                 }
             }
         }
@@ -683,10 +675,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, CellRevealPosition.Top);
+            this._revealInternal(viewIndex, true, 0 );
         }
         else {
-            this._revealInternal(viewIndex, true, CellRevealPosition.Bottom, firstLine);
+            this._revealInternal(viewIndex, true, 2 , firstLine);
         }
     }
     scrollToBottom() {
@@ -701,28 +693,28 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
             return;
         }
         switch (revealType) {
-            case CellRevealType.Top:
-                this._revealInternal(index, false, CellRevealPosition.Top);
+            case 2 :
+                this._revealInternal(index, false, 0 );
                 break;
-            case CellRevealType.Center:
-                this._revealInternal(index, false, CellRevealPosition.Center);
+            case 3 :
+                this._revealInternal(index, false, 1 );
                 break;
-            case CellRevealType.CenterIfOutsideViewport:
-                this._revealInternal(index, true, CellRevealPosition.Center);
+            case 4 :
+                this._revealInternal(index, true, 1 );
                 break;
-            case CellRevealType.NearTopIfOutsideViewport:
-                this._revealInternal(index, true, CellRevealPosition.NearTop);
+            case 5 :
+                this._revealInternal(index, true, 3 );
                 break;
-            case CellRevealType.FirstLineIfOutsideViewport:
+            case 6 :
                 this._revealInViewWithMinimalScrolling(index, true);
                 break;
-            case CellRevealType.Default:
+            case 1 :
                 this._revealInViewWithMinimalScrolling(index);
                 break;
         }
         if ((
         (
-        cell.getEditState() === CellEditState.Editing || (revealType === CellRevealType.FirstLineIfOutsideViewport && cell.cellKind === CellKind.Code))) && !cell.editorAttached) {
+        cell.getEditState() === CellEditState.Editing || (revealType === 6  && cell.cellKind === CellKind.Code))) && !cell.editorAttached) {
             return getEditorAttachedPromise(cell);
         }
         return;
@@ -741,12 +733,12 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
             }
         }
         switch (revealPosition) {
-            case CellRevealPosition.Top:
+            case 0 :
                 this.view.setScrollTop(elementTop);
                 this.view.setScrollTop(this.view.elementTop(viewIndex));
                 break;
-            case CellRevealPosition.Center:
-            case CellRevealPosition.NearTop:
+            case 1 :
+            case 3 :
                 {
                     this.view.setScrollTop(elementTop - this.view.renderHeight / 2);
                     const newElementTop = this.view.elementTop(viewIndex);
@@ -755,15 +747,15 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
                     if (newElementHeight >= renderHeight) {
                         this.view.setScrollTop(newElementTop);
                     }
-                    else if (revealPosition === CellRevealPosition.Center) {
+                    else if (revealPosition === 1 ) {
                         this.view.setScrollTop(newElementTop + (newElementHeight / 2) - (renderHeight / 2));
                     }
-                    else if (revealPosition === CellRevealPosition.NearTop) {
+                    else if (revealPosition === 3 ) {
                         this.view.setScrollTop(newElementTop - (renderHeight / 5));
                     }
                 }
                 break;
-            case CellRevealPosition.Bottom:
+            case 2 :
                 if (firstLine) {
                     const lineHeight = this.viewModel?.layoutInfo?.fontInfo.lineHeight ?? 15;
                     const padding = this.notebookOptions.getLayoutConfiguration().cellTopMargin + this.notebookOptions.getLayoutConfiguration().editorTopPadding;
@@ -920,7 +912,7 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
         }
     }
     _revealInCenterIfOutsideViewport(viewIndex) {
-        this._revealInternal(viewIndex, true, CellRevealPosition.Center);
+        this._revealInternal(viewIndex, true, 1 );
     }
     domElementOfElement(element) {
         const index = this._getViewIndexUpperBound(element);

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

@@ -41,15 +41,15 @@ import { Themable } from '../../../../../../platform/theme/common/themeService.j
 import { IThemeService } from '../../../../../../platform/theme/common/themeService.service.js';
 import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.service.js';
 import { IWorkspaceTrustManagementService } from '../../../../../../platform/workspace/common/workspaceTrust.service.js';
-import { CellEditState, RenderOutputType } from '../../notebookBrowser.js';
+import { CellEditState } from '../../notebookBrowser.js';
 import { NOTEBOOK_WEBVIEW_BOUNDARY } from '../notebookCellList.js';
 import { preloadsScriptStr } from './webviewPreloads.js';
 import { transformWebviewThemeVars } from './webviewThemeMapping.js';
 import { MarkupCellViewModel } from '../../viewModel/markupCellViewModel.js';
-import { RendererMessagingSpec, CellUri } from '../../../common/notebookCommon.js';
+import { CellUri } from '../../../common/notebookCommon.js';
 import { INotebookLoggingService } from '../../../common/notebookLoggingService.service.js';
 import { INotebookService } from '../../../common/notebookService.service.js';
-import { WebviewOriginStore, WebviewContentPurpose } from '../../../../webview/browser/webview.js';
+import { WebviewOriginStore } from '../../../../webview/browser/webview.js';
 import { IWebviewService } from '../../../../webview/browser/webview.service.js';
 import { WebviewWindowDragMonitor } from '../../../../webview/browser/webviewWindowDragMonitor.js';
 import { webviewGenericCspSource, asWebviewUri } from '../../../../webview/common/webview.js';
@@ -183,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': ( localize(10699, "Empty markdown cell, double-click or press enter to edit.")),
-            'notebook-cell-renderer-not-found-error': ( localize(10700, "No renderer found for '$0'")),
-            'notebook-cell-renderer-fallbacks-exhausted': ( localize(10701, "Could not render content for '$0'")),
+            'notebook-cell-markup-empty-content': ( localize(10800, "Empty markdown cell, double-click or press enter to edit.")),
+            'notebook-cell-renderer-not-found-error': ( localize(10801, "No renderer found for '$0'")),
+            'notebook-cell-renderer-fallbacks-exhausted': ( localize(10802, "Could not render content for '$0'")),
         };
     }
     generateContent(baseUrl) {
@@ -393,7 +393,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
                     id: renderer.id,
                     entrypoint,
                     mimeTypes: renderer.mimeTypes,
-                    messaging: renderer.messaging !== RendererMessagingSpec.Never,
+                    messaging: renderer.messaging !== "never"  && !!this.rendererMessaging,
                     isBuiltin: renderer.isBuiltin
                 };
             }))
@@ -985,9 +985,9 @@ 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: ( localize(10702, "Notebook webview content")),
+            title: ( localize(10803, "Notebook webview content")),
             options: {
-                purpose: WebviewContentPurpose.NotebookRenderer,
+                purpose: "notebookRenderer" ,
                 enableFindWidget: false,
                 transformCssVariables: transformWebviewThemeVars,
             },
@@ -1220,7 +1220,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
         return this.initializeMarkupPromise.p.p;
     }
     _cachedInsetEqual(cachedInset, content) {
-        if (content.type === RenderOutputType.Extension) {
+        if (content.type === 1 ) {
             return cachedInset.renderer?.id === content.renderer.id;
         }
         else {
@@ -1300,7 +1300,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
         const transfer = [];
         let message;
         let renderer;
-        if (content.type === RenderOutputType.Extension) {
+        if (content.type === 1 ) {
             const output = content.source.model;
             renderer = content.renderer;
             const first = output.outputs.find(op => op.mime === content.mimeType);
@@ -1311,7 +1311,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
                 outputId: output.outputId,
                 rendererId: content.renderer.id,
                 content: {
-                    type: RenderOutputType.Extension,
+                    type: 1 ,
                     outputId: output.outputId,
                     metadata: metadata,
                     output: {
@@ -1355,14 +1355,14 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
         this.hiddenInsetMapping.delete(content.source);
         let updatedContent = undefined;
         const transfer = [];
-        if (content.type === RenderOutputType.Extension) {
+        if (content.type === 1 ) {
             const output = content.source.model;
             const firstBuffer = output.outputs.find(op => op.mime === content.mimeType);
             const appenededData = output.appendedSinceVersion(outputCache.versionId, content.mimeType);
             const appended = appenededData ? { valueBytes: appenededData.buffer, previousVersion: outputCache.versionId } : undefined;
             const valueBytes = copyBufferIfNeeded(firstBuffer.data.buffer, transfer);
             updatedContent = {
-                type: RenderOutputType.Extension,
+                type: 1 ,
                 outputId: outputCache.outputId,
                 metadata: output.metadata,
                 output: {

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

@@ -229,7 +229,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 = ( localize(10703, 'Execution Order'));
+        executionOrderLabel.title = ( localize(10804, 'Execution Order'));
         const editorPart = append(cellContainer, $('.cell-editor-part'));
         const editorContainer = append(editorPart, $('.cell-editor-container'));
         const cellCommentPartContainer = append(container, $('.cell-comment-container'));
@@ -275,12 +275,11 @@ let CodeCellRenderer = class CodeCellRenderer extends AbstractCellRenderer {
             focusIndicatorRight,
             focusIndicatorBottom
         ))));
-        const cellParts = ( (new CellPartsCollection(getWindow(rootContainer), [
+        const contentParts = [
             focusIndicatorPart,
             templateDisposables.add(scopedInstaService.createInstance(CellChatPart, this.notebookEditor, cellChatPart)),
             templateDisposables.add(scopedInstaService.createInstance(CellEditorStatusBar, this.notebookEditor, container, editorPart, editor)),
             templateDisposables.add(scopedInstaService.createInstance(CellProgressBar, editorPart, cellInputCollapsedContainer)),
-            templateDisposables.add(scopedInstaService.createInstance(RunToolbar, this.notebookEditor, contextKeyService, container, runButtonContainer)),
             templateDisposables.add(( (new CellDecorations(rootContainer, decorationContainer)))),
             templateDisposables.add(scopedInstaService.createInstance(CellComments, this.notebookEditor, cellCommentPartContainer)),
             templateDisposables.add(scopedInstaService.createInstance(CellExecutionPart, this.notebookEditor, executionOrderLabel)),
@@ -289,7 +288,12 @@ let CodeCellRenderer = class CodeCellRenderer extends AbstractCellRenderer {
             templateDisposables.add(( (new CellFocusPart(container, focusSinkElement, this.notebookEditor)))),
             templateDisposables.add(( (new CellDragAndDropPart(container)))),
             templateDisposables.add(scopedInstaService.createInstance(CellContextKeyPart, this.notebookEditor)),
-        ], [
+        ];
+        const { cellExecutePrimary, cellExecuteToolbar } = this.notebookEditor.creationOptions.menuIds;
+        if (cellExecutePrimary && cellExecuteToolbar) {
+            contentParts.push(templateDisposables.add(scopedInstaService.createInstance(RunToolbar, this.notebookEditor, contextKeyService, container, runButtonContainer, cellExecutePrimary, cellExecuteToolbar)));
+        }
+        const cellParts = ( (new CellPartsCollection(getWindow(rootContainer), contentParts, [
             titleToolbar,
             templateDisposables.add(scopedInstaService.createInstance(BetweenCellToolbar, this.notebookEditor, titleToolbarContainer, bottomCellToolbarContainer))
         ])));

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

@@ -82,6 +82,9 @@ async function webviewPreloads(ctx) {
             postNotebookMessage('outputBlur', outputFocus);
         }, 0);
     };
+    const isEditableElement = (element) => {
+        return element.tagName.toLowerCase() === 'input' || element.tagName.toLowerCase() === 'textarea' || 'editContext' in element;
+    };
     const checkOutputInputFocus = (e) => {
         lastFocusedOutput = getOutputContainer(e);
         const activeElement = window.document.activeElement;
@@ -89,7 +92,7 @@ async function webviewPreloads(ctx) {
             return;
         }
         const id = lastFocusedOutput?.id;
-        if (id && (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA' || activeElement.tagName === 'SELECT')) {
+        if (id && (isEditableElement(activeElement) || activeElement.tagName === 'SELECT')) {
             postNotebookMessage('outputInputFocus', { inputFocused: true, id });
             activeElement.addEventListener('blur', () => {
                 postNotebookMessage('outputInputFocus', { inputFocused: false, id });
@@ -181,7 +184,7 @@ async function webviewPreloads(ctx) {
             return;
         }
         const activeElement = window.document.activeElement;
-        if (activeElement?.tagName === 'INPUT' || activeElement?.tagName === 'TEXTAREA') {
+        if (activeElement && isEditableElement(activeElement)) {
             activeElement.select();
         }
     };
@@ -202,7 +205,7 @@ async function webviewPreloads(ctx) {
             return;
         }
         const activeElement = window.document.activeElement;
-        if (activeElement?.tagName === 'INPUT' || activeElement?.tagName === 'TEXTAREA') {
+        if (activeElement && isEditableElement(activeElement)) {
             return;
         }
         e.stopPropagation();
@@ -225,7 +228,7 @@ async function webviewPreloads(ctx) {
             return;
         }
         const activeElement = window.document.activeElement;
-        if (activeElement?.tagName === 'INPUT' || activeElement?.tagName === 'TEXTAREA') {
+        if (activeElement && isEditableElement(activeElement)) {
             return;
         }
         if ((e.key === 'a' && e.ctrlKey) || (e.metaKey && e.key === 'a')) {
@@ -485,7 +488,7 @@ async function webviewPreloads(ctx) {
                 postNotebookMessage('outputInputFocus', { inputFocused: false, id });
             }
             else {
-                const inputFocused = focusableElement.tagName === 'INPUT' || focusableElement.tagName === 'TEXTAREA';
+                const inputFocused = isEditableElement(focusableElement);
                 postNotebookMessage('outputInputFocus', { inputFocused, id });
             }
             lastFocusedOutput = cellOutputContainer;

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

@@ -3,7 +3,6 @@ import { Disposable, MutableDisposable, dispose } from '../../../../../base/comm
 import { Mimes } from '../../../../../base/common/mime.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 import { Selection } from '../../../../../editor/common/core/selection.js';
-import { ScrollType } from '../../../../../editor/common/editorCommon.js';
 import { SearchParams } from '../../../../../editor/common/model/textModelSearch.js';
 import { writeTransientState, readTransientState } from '../../../codeEditor/browser/toggleWordWrap.js';
 import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js';
@@ -384,7 +383,7 @@ class BaseCellViewModel extends Disposable {
         return Array.from(( this._cellStatusBarItems.values()));
     }
     revealRangeInCenter(range) {
-        this._textEditor?.revealRangeInCenter(range, ScrollType.Immediate);
+        this._textEditor?.revealRangeInCenter(range, 1 );
     }
     setSelection(range) {
         this._textEditor?.setSelection(range);

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

@@ -1,11 +1,11 @@
 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/arrays.js';
 import '../../../../../base/common/observableInternal/autorun.js';
-import '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/cancellation.js';
-import '../../../../../base/common/arrays.js';
+import '../../../../../base/common/observableInternal/utils.js';
 import { RENDERER_NOT_AVAILABLE } from '../../common/notebookCommon.js';
 let handle = 0;
 class CellOutputViewModel extends Disposable {

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

@@ -2,11 +2,11 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { Emitter, PauseableEmitter } from '../../../../../base/common/event.js';
 import { dispose } from '../../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../../base/common/observableInternal/base.js';
-import '../../../../../base/common/observableInternal/derived.js';
+import '../../../../../base/common/arrays.js';
 import '../../../../../base/common/observableInternal/autorun.js';
-import '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/cancellation.js';
-import '../../../../../base/common/arrays.js';
+import '../../../../../base/common/observableInternal/utils.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
 import { PrefixSumComputer } from '../../../../../editor/common/model/prefixSumComputer.js';

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

@@ -2,7 +2,6 @@ import { renderMarkdownAsPlaintext } from '../../../../../base/browser/markdownR
 import { Emitter } from '../../../../../base/common/event.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { marked } from 'marked';
-import { TrackedRangeStickiness } from '../../../../../editor/common/model.js';
 import { FoldingRegions } from '../../../../../editor/contrib/folding/browser/foldingRanges.js';
 import { sanitizeRanges } from '../../../../../editor/contrib/folding/browser/syntaxRangeProvider.js';
 import { CellKind } from '../../common/notebookCommon.js';
@@ -195,9 +194,9 @@ class FoldingModel {
             const region = newRegions.toRegion(i);
             cellRanges.push({ start: region.startLineNumber - 1, end: region.endLineNumber - 1 });
         }
-        this._foldingRangeDecorationIds.forEach(id => viewModel.setTrackedRange(id, null, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter));
+        this._foldingRangeDecorationIds.forEach(id => viewModel.setTrackedRange(id, null, 3 ));
         this._foldingRangeDecorationIds = ( cellRanges.map(
-            region => viewModel.setTrackedRange(null, region, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter)
+            region => viewModel.setTrackedRange(null, region, 3 )
         )).filter(str => str !== null);
         this._regions = newRegions;
         this._onDidFoldingRegionChanges.fire();

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { Emitter } from '../../../../../base/common/event.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
-import { CellLayoutState, CellLayoutContext, CellEditState, CellFoldingState } from '../notebookBrowser.js';
+import { CellLayoutState, CellLayoutContext, CellEditState } from '../notebookBrowser.js';
 import { BaseCellViewModel } from './baseCellViewModel.js';
 import { CellKind } from '../../common/notebookCommon.js';
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
@@ -124,7 +124,7 @@ let MarkupCellViewModel = class MarkupCellViewModel extends BaseCellViewModel {
         }
     }
     _computeFoldHintHeight() {
-        return (this.getEditState() === CellEditState.Editing || this.foldingState !== CellFoldingState.Collapsed) ?
+        return ((this.getEditState() === CellEditState.Editing || this.foldingState !== 2) ) ?
             0 : this.viewContext.notebookOptions.getLayoutConfiguration().markdownFoldHintHeight;
     }
     updateOptions(e) {

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

@@ -7,7 +7,6 @@ import { clamp } from '../../../../../base/common/numbers.js';
 import { singleLetterHash } from '../../../../../base/common/strings.js';
 import { ResourceTextEdit, IBulkEditService } from '../../../../../editor/browser/services/bulkEditService.js';
 import { Range } from '../../../../../editor/common/core/range.js';
-import { TrackedRangeStickiness } from '../../../../../editor/common/model.js';
 import { SingleModelEditStackElement, MultiModelEditStackElement } from '../../../../../editor/common/model/editStack.js';
 import { IntervalNode, IntervalTree } from '../../../../../editor/common/model/intervalTree.js';
 import { ModelDecorationOptions } from '../../../../../editor/common/model/textModel.js';
@@ -15,7 +14,7 @@ import { ITextModelService } from '../../../../../editor/common/services/resolve
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.service.js';
 import { CellFindMatchModel } from '../contrib/find/findModel.js';
-import { CellFoldingState, CellEditState } from '../notebookBrowser.js';
+import { CellEditState } from '../notebookBrowser.js';
 import { NotebookMetadataChangedEvent } from '../notebookViewEvents.js';
 import { NotebookCellSelectionCollection } from './cellSelectionCollection.js';
 import { CodeCellViewModel } from './codeCellViewModel.js';
@@ -58,10 +57,10 @@ class DecorationsTree {
     }
 }
 const TRACKED_RANGE_OPTIONS = [
-    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-always-grows-when-typing-at-edges', stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges }),
-    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-never-grows-when-typing-at-edges', stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges }),
-    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-grows-only-when-typing-before', stickiness: TrackedRangeStickiness.GrowsOnlyWhenTypingBefore }),
-    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-grows-only-when-typing-after', stickiness: TrackedRangeStickiness.GrowsOnlyWhenTypingAfter }),
+    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-always-grows-when-typing-at-edges', stickiness: 0  }),
+    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-never-grows-when-typing-at-edges', stickiness: 1  }),
+    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-grows-only-when-typing-before', stickiness: 2  }),
+    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-grows-only-when-typing-after', stickiness: 3  }),
 ];
 function _normalizeOptions(options) {
     if (options instanceof ModelDecorationOptions) {
@@ -88,6 +87,9 @@ let NotebookViewModel = class NotebookViewModel extends Disposable {
     get metadata() {
         return this._notebook.metadata;
     }
+    get isRepl() {
+        return this.viewType === 'repl';
+    }
     get onDidChangeViewCells() { return this._onDidChangeViewCells.event; }
     get lastNotebookEditResource() {
         if (this._lastNotebookEditResource.length) {
@@ -148,7 +150,6 @@ let NotebookViewModel = class NotebookViewModel extends Disposable {
         MODEL_ID++;
         this.id = '$notebookViewModel' + MODEL_ID;
         this._instanceId = singleLetterHash(MODEL_ID);
-        this.replView = !!this.options.inRepl;
         const compute = (changes, synchronous) => {
             const diffs = ( changes.map(splice => {
                 return [splice[0], splice[1], ( splice[2].map(cell => {
@@ -259,7 +260,7 @@ let NotebookViewModel = class NotebookViewModel extends Disposable {
         this._register(this._selectionCollection.onDidChangeSelection(e => {
             this._onDidChangeSelection.fire(e);
         }));
-        const viewCellCount = this.replView ? this._notebook.cells.length - 1 : this._notebook.cells.length;
+        const viewCellCount = this.isRepl ? this._notebook.cells.length - 1 : this._notebook.cells.length;
         for (let i = 0; i < viewCellCount; i++) {
             this._viewCells.push(createCellViewModel(this._instantiationService, this, this._notebook.cells[i], this._viewContext));
         }
@@ -322,14 +323,14 @@ let NotebookViewModel = class NotebookViewModel extends Disposable {
     }
     getFoldingState(index) {
         if (!this._foldingRanges) {
-            return CellFoldingState.None;
+            return 0 ;
         }
         const range = this._foldingRanges.findRange(index + 1);
         const startIndex = this._foldingRanges.getStartLineNumber(range) - 1;
         if (startIndex !== index) {
-            return CellFoldingState.None;
+            return 0 ;
         }
-        return this._foldingRanges.isCollapsed(range) ? CellFoldingState.Collapsed : CellFoldingState.Expanded;
+        return this._foldingRanges.isCollapsed(range) ? 2  : 1 ;
     }
     getFoldedLength(index) {
         if (!this._foldingRanges) {

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

@@ -6,7 +6,6 @@ import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.service.js';
-import { CellFoldingState } from '../notebookBrowser.js';
 import { CellKind } from '../../common/notebookCommon.js';
 import { Delayer } from '../../../../../base/common/async.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
@@ -37,7 +36,7 @@ class NotebookStickyLine extends Disposable {
         const foldingController = this.notebookEditor.getContribution(FoldingController.id);
         const index = this.entry.index;
         const headerLevel = this.entry.level;
-        const newFoldingState = (currentState === CellFoldingState.Collapsed) ? CellFoldingState.Expanded : CellFoldingState.Collapsed;
+        const newFoldingState = ((currentState === 2) ) ? 1  : 2 ;
         foldingController.setFoldingStateDown(index, newFoldingState, headerLevel);
         this.focusCell();
     }
@@ -286,7 +285,7 @@ let NotebookStickyScroll = NotebookStickyScroll_1 = class NotebookStickyScroll e
         }
         let isCollapsed = false;
         if (entry.cell.cellKind === CellKind.Markup) {
-            isCollapsed = entry.cell.foldingState === CellFoldingState.Collapsed;
+            isCollapsed = entry.cell.foldingState === 2 ;
         }
         const stickyFoldingIcon = ( new StickyFoldingIcon(isCollapsed, 16));
         stickyFoldingIcon.domNode.classList.add('notebook-sticky-scroll-folding-icon');