@codingame/monaco-vscode-api 8.0.3 → 9.0.0

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

@@ -13,7 +13,7 @@ import './media/notebookCellOutput.css.js';
 import './media/notebookEditorStickyScroll.css.js';
 import './media/notebookKernelActionViewItem.css.js';
 import './media/notebookOutline.css.js';
-import { getWindow, append, createStyleSheet, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, trackFocus, scheduleAtNextAnimationFrame, runWhenWindowIdle, size, isAncestorOfActiveElement, $ as $$1 } from '../../../../base/browser/dom.js';
+import { getWindow, append, createStyleSheet, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, trackFocus, runWhenWindowIdle, scheduleAtNextAnimationFrame, size, isAncestorOfActiveElement, $ as $$1 } from '../../../../base/browser/dom.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 import { SequencerByKey, DeferredPromise } from '../../../../base/common/async.js';
 import { Color, RGBA } from '../../../../base/common/color.js';
@@ -95,6 +95,8 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
 import { PreventDefaultContextMenuItemsContextKeyName } from '../../webview/browser/webview.contribution.js';
 import { NotebookAccessibilityProvider } from './notebookAccessibilityProvider.js';
+import { NotebookHorizontalTracker } from './viewParts/notebookHorizontalTracker.js';
+import { NotebookCellEditorPool } from './view/notebookCellEditorPool.js';
 const $ = $$1;
 function getDefaultNotebookCreationOptions() {
     const skipContributions = [
@@ -149,6 +151,17 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         const [focused] = this._list.getFocusedElements();
         return this._renderedEditors.get(focused);
     }
+    get activeCellAndCodeEditor() {
+        if (this._isDisposed) {
+            return;
+        }
+        const [focused] = this._list.getFocusedElements();
+        const editor = this._renderedEditors.get(focused);
+        if (!editor) {
+            return;
+        }
+        return [focused, editor];
+    }
     get codeEditors() {
         return [...this._renderedEditors];
     }
@@ -190,6 +203,8 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this.onDidChangeDecorations = this._onDidChangeDecorations.event;
         this._onDidScroll = this._register(( (new Emitter())));
         this.onDidScroll = this._onDidScroll.event;
+        this._onDidChangeLayout = this._register(( (new Emitter())));
+        this.onDidChangeLayout = this._onDidChangeLayout.event;
         this._onDidChangeActiveCell = this._register(( (new Emitter())));
         this.onDidChangeActiveCell = this._onDidChangeActiveCell.event;
         this._onDidChangeFocus = this._register(( (new Emitter())));
@@ -257,6 +272,9 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             eventDispatcher,
             language => this.getBaseCellEditorOptions(language)
         )));
+        this._register(this._viewContext.eventDispatcher.onDidChangeLayout(() => {
+            this._onDidChangeLayout.fire();
+        }));
         this._register(this._viewContext.eventDispatcher.onDidChangeCellState(e => {
             this._onDidChangeCellState.fire(e);
         }));
@@ -488,6 +506,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this._notebookOverviewRulerContainer.classList.add('notebook-overview-ruler-container');
         this._list.scrollableElement.appendChild(this._notebookOverviewRulerContainer);
         this._registerNotebookOverviewRuler();
+        this._register(this.instantiationService.createInstance(NotebookHorizontalTracker, this, this._list.scrollableElement));
         this._overflowContainer = document.createElement('div');
         this._overflowContainer.classList.add('notebook-overflow-widget-container', 'monaco-editor');
         append(parent, this._overflowContainer);
@@ -718,8 +737,9 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this._body.classList.add('cell-list-container');
         this._dndController = this._register(( (new CellDragAndDropController(this, this._body))));
         const getScopedContextKeyService = (container) => this._list.contextKeyService.createScoped(container);
+        this._editorPool = this._register(this.instantiationService.createInstance(NotebookCellEditorPool, this, getScopedContextKeyService));
         const renderers = [
-            this.instantiationService.createInstance(CodeCellRenderer, this, this._renderedEditors, this._dndController, getScopedContextKeyService),
+            this.instantiationService.createInstance(CodeCellRenderer, this, this._renderedEditors, this._editorPool, this._dndController, getScopedContextKeyService),
             this.instantiationService.createInstance(MarkupCellRenderer, this, this._dndController, this._renderedEditors, getScopedContextKeyService),
         ];
         renderers.forEach(renderer => {
@@ -852,25 +872,21 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         }));
     }
     _registerNotebookStickyScroll() {
-        this._notebookStickyScroll = this._register(this.instantiationService.createInstance(NotebookStickyScroll, this._notebookStickyScrollContainer, this, this._list));
-        const localDisposableStore = this._register(( (new DisposableStore())));
-        this._register(this._notebookStickyScroll.onDidChangeNotebookStickyScroll((sizeDelta) => {
-            const d = localDisposableStore.add(scheduleAtNextAnimationFrame(getWindow(this.getDomNode()), () => {
-                if (this.isDisposed) {
-                    return;
+        this._notebookStickyScroll = this._register(this.instantiationService.createInstance(NotebookStickyScroll, this._notebookStickyScrollContainer, this, this._list, (sizeDelta) => {
+            if (this.isDisposed) {
+                return;
+            }
+            if (this._dimension && this._isVisible) {
+                if (sizeDelta > 0) {
+                    this.layout(this._dimension);
+                    this.setScrollTop(this.scrollTop + sizeDelta);
                 }
-                if (this._dimension && this._isVisible) {
-                    if (sizeDelta > 0) {
-                        this.layout(this._dimension);
-                        this.setScrollTop(this.scrollTop + sizeDelta);
-                    }
-                    else if (sizeDelta < 0) {
-                        this.setScrollTop(this.scrollTop + sizeDelta);
-                        this.layout(this._dimension);
-                    }
+                else if (sizeDelta < 0) {
+                    this.setScrollTop(this.scrollTop + sizeDelta);
+                    this.layout(this._dimension);
                 }
-                localDisposableStore.delete(d);
-            }));
+            }
+            this._onDidScroll.fire();
         }));
     }
     _updateOutputRenderers() {
@@ -1663,6 +1679,9 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
     get scrollTop() {
         return this._list.scrollTop;
     }
+    get scrollBottom() {
+        return this._list.scrollTop + this._list.getRenderHeight();
+    }
     getAbsoluteTopOfElement(cell) {
         return this._list.getCellViewScrollTop(cell);
     }
@@ -2565,43 +2584,43 @@ const notebookCellBorder = registerColor('notebook.cellBorderColor', {
     light: ( (transparent(listInactiveSelectionBackground, 1))),
     hcDark: PANEL_BORDER,
     hcLight: PANEL_BORDER
-}, ( localize(7794, "The border color for notebook cells.")));
-registerColor('notebook.focusedEditorBorder', focusBorder, ( localize(7795, "The color of the notebook cell editor border.")));
-const cellStatusIconSuccess = registerColor('notebookStatusSuccessIcon.foreground', debugIconStartForeground, ( localize(7796, "The error icon color of notebook cells in the cell status bar.")));
+}, ( localize(8026, "The border color for notebook cells.")));
+registerColor('notebook.focusedEditorBorder', focusBorder, ( localize(8027, "The color of the notebook cell editor border.")));
+const cellStatusIconSuccess = registerColor('notebookStatusSuccessIcon.foreground', debugIconStartForeground, ( localize(8028, "The error icon color of notebook cells in the cell status bar.")));
 const runningCellRulerDecorationColor = registerColor('notebookEditorOverviewRuler.runningCellForeground', debugIconStartForeground, ( localize(
-    7797,
+    8029,
     "The color of the running cell decoration in the notebook editor overview ruler."
 )));
-const cellStatusIconError = registerColor('notebookStatusErrorIcon.foreground', errorForeground, ( localize(7798, "The error icon color of notebook cells in the cell status bar.")));
-registerColor('notebookStatusRunningIcon.foreground', foreground, ( localize(7799, "The running icon color of notebook cells in the cell status bar.")));
-registerColor('notebook.outputContainerBorderColor', null, ( localize(7800, "The border color of the notebook output container.")));
-registerColor('notebook.outputContainerBackgroundColor', null, ( localize(7801, "The color of the notebook output container background.")));
+const cellStatusIconError = registerColor('notebookStatusErrorIcon.foreground', errorForeground, ( localize(8030, "The error icon color of notebook cells in the cell status bar.")));
+registerColor('notebookStatusRunningIcon.foreground', foreground, ( localize(8031, "The running icon color of notebook cells in the cell status bar.")));
+registerColor('notebook.outputContainerBorderColor', null, ( localize(8032, "The border color of the notebook output container.")));
+registerColor('notebook.outputContainerBackgroundColor', null, ( localize(8033, "The color of the notebook output container background.")));
 registerColor('notebook.cellToolbarSeparator', {
     dark: ( (( (Color.fromHex('#808080'))).transparent(0.35))),
     light: ( (( (Color.fromHex('#808080'))).transparent(0.35))),
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(7802, "The color of the separator in the cell bottom toolbar")));
-const focusedCellBackground = registerColor('notebook.focusedCellBackground', null, ( localize(7803, "The background color of a cell when the cell is focused.")));
+}, ( localize(8034, "The color of the separator in the cell bottom toolbar")));
+const focusedCellBackground = registerColor('notebook.focusedCellBackground', null, ( localize(8035, "The background color of a cell when the cell is focused.")));
 registerColor('notebook.selectedCellBackground', {
     dark: listInactiveSelectionBackground,
     light: listInactiveSelectionBackground,
     hcDark: null,
     hcLight: null
-}, ( localize(7804, "The background color of a cell when the cell is selected.")));
+}, ( localize(8036, "The background color of a cell when the cell is selected.")));
 registerColor('notebook.cellHoverBackground', {
     dark: ( (transparent(focusedCellBackground, .5))),
     light: ( (transparent(focusedCellBackground, .7))),
     hcDark: null,
     hcLight: null
-}, ( localize(7805, "The background color of a cell when the cell is hovered.")));
+}, ( localize(8037, "The background color of a cell when the cell is hovered.")));
 registerColor('notebook.selectedCellBorder', {
     dark: notebookCellBorder,
     light: notebookCellBorder,
     hcDark: contrastBorder,
     hcLight: contrastBorder
 }, ( localize(
-    7806,
+    8038,
     "The color of the cell's top and bottom border when the cell is selected but not focused."
 )));
 registerColor('notebook.inactiveSelectedCellBorder', {
@@ -2609,13 +2628,13 @@ registerColor('notebook.inactiveSelectedCellBorder', {
     light: null,
     hcDark: focusBorder,
     hcLight: focusBorder
-}, ( localize(7807, "The color of the cell's borders when multiple cells are selected.")));
+}, ( localize(8039, "The color of the cell's borders when multiple cells are selected.")));
 registerColor('notebook.focusedCellBorder', focusBorder, ( localize(
-    7808,
+    8040,
     "The color of the cell's focus indicator borders when the cell is focused."
 )));
 registerColor('notebook.inactiveFocusedCellBorder', notebookCellBorder, ( localize(
-    7809,
+    8041,
     "The color of the cell's top and bottom border when a cell is focused while the primary focus is outside of the editor."
 )));
 registerColor('notebook.cellStatusBarItemHoverBackground', {
@@ -2623,27 +2642,27 @@ registerColor('notebook.cellStatusBarItemHoverBackground', {
     dark: ( (new Color( (new RGBA(255, 255, 255, 0.15))))),
     hcDark: ( (new Color( (new RGBA(255, 255, 255, 0.15))))),
     hcLight: ( (new Color( (new RGBA(0, 0, 0, 0.08))))),
-}, ( localize(7810, "The background color of notebook cell status bar items.")));
-registerColor('notebook.cellInsertionIndicator', focusBorder, ( localize(7811, "The color of the notebook cell insertion indicator.")));
-registerColor('notebookScrollbarSlider.background', scrollbarSliderBackground, ( localize(7812, "Notebook scrollbar slider background color.")));
-registerColor('notebookScrollbarSlider.hoverBackground', scrollbarSliderHoverBackground, ( localize(7813, "Notebook scrollbar slider background color when hovering.")));
-registerColor('notebookScrollbarSlider.activeBackground', scrollbarSliderActiveBackground, ( localize(7814, "Notebook scrollbar slider background color when clicked on.")));
+}, ( localize(8042, "The background color of notebook cell status bar items.")));
+registerColor('notebook.cellInsertionIndicator', focusBorder, ( localize(8043, "The color of the notebook cell insertion indicator.")));
+registerColor('notebookScrollbarSlider.background', scrollbarSliderBackground, ( localize(8044, "Notebook scrollbar slider background color.")));
+registerColor('notebookScrollbarSlider.hoverBackground', scrollbarSliderHoverBackground, ( localize(8045, "Notebook scrollbar slider background color when hovering.")));
+registerColor('notebookScrollbarSlider.activeBackground', scrollbarSliderActiveBackground, ( localize(8046, "Notebook scrollbar slider background color when clicked on.")));
 registerColor('notebook.symbolHighlightBackground', {
     dark: ( (Color.fromHex('#ffffff0b'))),
     light: ( (Color.fromHex('#fdff0033'))),
     hcDark: null,
     hcLight: null
-}, ( localize(7815, "Background color of highlighted cell")));
+}, ( localize(8047, "Background color of highlighted cell")));
 registerColor('notebook.cellEditorBackground', {
     light: SIDE_BAR_BACKGROUND,
     dark: SIDE_BAR_BACKGROUND,
     hcDark: null,
     hcLight: null
-}, ( localize(7816, "Cell editor background color.")));
+}, ( localize(8048, "Cell editor background color.")));
 const notebookEditorBackground = registerColor('notebook.editorBackground', {
     light: EDITOR_PANE_BACKGROUND,
     dark: EDITOR_PANE_BACKGROUND,
     hcDark: null,
     hcLight: null
-}, ( localize(7817, "Notebook background color.")));
+}, ( localize(8049, "Notebook background color.")));
 export { NotebookEditorWidget, cellStatusIconError, cellStatusIconSuccess, focusedCellBackground, getDefaultNotebookCreationOptions, notebookCellBorder, runningCellRulerDecorationColor };

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

@@ -1,32 +1,32 @@
 import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const selectKernelIcon = registerIcon('notebook-kernel-select', Codicon.serverEnvironment, ( localize(5628, 'Configure icon to select a kernel in notebook editors.')));
-const executeIcon = registerIcon('notebook-execute', Codicon.play, ( localize(5629, 'Icon to execute in notebook editors.')));
-const configIcon = registerIcon('notebook-config', Codicon.gear, ( localize(5630, 'Icon to configure in notebook editors.')));
-const executeAboveIcon = registerIcon('notebook-execute-above', Codicon.runAbove, ( localize(5631, 'Icon to execute above cells in notebook editors.')));
-const executeBelowIcon = registerIcon('notebook-execute-below', Codicon.runBelow, ( localize(5632, 'Icon to execute below cells in notebook editors.')));
-const stopIcon = registerIcon('notebook-stop', Codicon.primitiveSquare, ( localize(5633, 'Icon to stop an execution in notebook editors.')));
-const deleteCellIcon = registerIcon('notebook-delete-cell', Codicon.trash, ( localize(5634, 'Icon to delete a cell in notebook editors.')));
-const executeAllIcon = registerIcon('notebook-execute-all', Codicon.runAll, ( localize(5635, 'Icon to execute all cells in notebook editors.')));
-const editIcon = registerIcon('notebook-edit', Codicon.pencil, ( localize(5636, 'Icon to edit a cell in notebook editors.')));
-const stopEditIcon = registerIcon('notebook-stop-edit', Codicon.check, ( localize(5637, 'Icon to stop editing a cell in notebook editors.')));
-const moveUpIcon = registerIcon('notebook-move-up', Codicon.arrowUp, ( localize(5638, 'Icon to move up a cell in notebook editors.')));
-const moveDownIcon = registerIcon('notebook-move-down', Codicon.arrowDown, ( localize(5639, 'Icon to move down a cell in notebook editors.')));
-const clearIcon = registerIcon('notebook-clear', Codicon.clearAll, ( localize(5640, 'Icon to clear cell outputs in notebook editors.')));
-const splitCellIcon = registerIcon('notebook-split-cell', Codicon.splitVertical, ( localize(5641, 'Icon to split a cell in notebook editors.')));
-const successStateIcon = registerIcon('notebook-state-success', Codicon.check, ( localize(5642, 'Icon to indicate a success state in notebook editors.')));
-const errorStateIcon = registerIcon('notebook-state-error', Codicon.error, ( localize(5643, 'Icon to indicate an error state in notebook editors.')));
-const pendingStateIcon = registerIcon('notebook-state-pending', Codicon.clock, ( localize(5644, 'Icon to indicate a pending state in notebook editors.')));
-const executingStateIcon = registerIcon('notebook-state-executing', Codicon.sync, ( localize(5645, 'Icon to indicate an executing state in notebook editors.')));
-const collapsedIcon = registerIcon('notebook-collapsed', Codicon.chevronRight, ( localize(5646, 'Icon to annotate a collapsed section in notebook editors.')));
-const expandedIcon = registerIcon('notebook-expanded', Codicon.chevronDown, ( localize(5647, 'Icon to annotate an expanded section in notebook editors.')));
-const openAsTextIcon = registerIcon('notebook-open-as-text', Codicon.fileCode, ( localize(5648, 'Icon to open the notebook in a text editor.')));
-const revertIcon = registerIcon('notebook-revert', Codicon.discard, ( localize(5649, 'Icon to revert in notebook editors.')));
-const renderOutputIcon = registerIcon('notebook-render-output', Codicon.preview, ( localize(5650, 'Icon to render output in diff editor.')));
-const mimetypeIcon = registerIcon('notebook-mimetype', Codicon.code, ( localize(5651, 'Icon for a mime type in notebook editors.')));
-const copyIcon = registerIcon('notebook-copy', Codicon.copy, ( localize(5652, 'Icon to copy content to clipboard')));
-const previousChangeIcon = registerIcon('notebook-diff-editor-previous-change', Codicon.arrowUp, ( localize(5653, 'Icon for the previous change action in the diff editor.')));
-const nextChangeIcon = registerIcon('notebook-diff-editor-next-change', Codicon.arrowDown, ( localize(5654, 'Icon for the next change action in the diff editor.')));
-const variablesViewIcon = registerIcon('variables-view-icon', Codicon.debugAlt, ( localize(5655, 'View icon of the variables view.')));
-export { clearIcon, collapsedIcon, configIcon, copyIcon, deleteCellIcon, editIcon, errorStateIcon, executeAboveIcon, executeAllIcon, executeBelowIcon, executeIcon, executingStateIcon, expandedIcon, mimetypeIcon, moveDownIcon, moveUpIcon, nextChangeIcon, openAsTextIcon, pendingStateIcon, previousChangeIcon, renderOutputIcon, revertIcon, selectKernelIcon, splitCellIcon, stopEditIcon, stopIcon, successStateIcon, variablesViewIcon };
+const selectKernelIcon = registerIcon('notebook-kernel-select', Codicon.serverEnvironment, ( localize(5572, 'Configure icon to select a kernel in notebook editors.')));
+const executeIcon = registerIcon('notebook-execute', Codicon.play, ( localize(5573, 'Icon to execute in notebook editors.')));
+const executeAboveIcon = registerIcon('notebook-execute-above', Codicon.runAbove, ( localize(5574, 'Icon to execute above cells in notebook editors.')));
+const executeBelowIcon = registerIcon('notebook-execute-below', Codicon.runBelow, ( localize(5575, 'Icon to execute below cells in notebook editors.')));
+const stopIcon = registerIcon('notebook-stop', Codicon.primitiveSquare, ( localize(5576, 'Icon to stop an execution in notebook editors.')));
+const deleteCellIcon = registerIcon('notebook-delete-cell', Codicon.trash, ( localize(5577, 'Icon to delete a cell in notebook editors.')));
+const executeAllIcon = registerIcon('notebook-execute-all', Codicon.runAll, ( localize(5578, 'Icon to execute all cells in notebook editors.')));
+const editIcon = registerIcon('notebook-edit', Codicon.pencil, ( localize(5579, 'Icon to edit a cell in notebook editors.')));
+const stopEditIcon = registerIcon('notebook-stop-edit', Codicon.check, ( localize(5580, 'Icon to stop editing a cell in notebook editors.')));
+const moveUpIcon = registerIcon('notebook-move-up', Codicon.arrowUp, ( localize(5581, 'Icon to move up a cell in notebook editors.')));
+const moveDownIcon = registerIcon('notebook-move-down', Codicon.arrowDown, ( localize(5582, 'Icon to move down a cell in notebook editors.')));
+const clearIcon = registerIcon('notebook-clear', Codicon.clearAll, ( localize(5583, 'Icon to clear cell outputs in notebook editors.')));
+const splitCellIcon = registerIcon('notebook-split-cell', Codicon.splitVertical, ( localize(5584, 'Icon to split a cell in notebook editors.')));
+const successStateIcon = registerIcon('notebook-state-success', Codicon.check, ( localize(5585, 'Icon to indicate a success state in notebook editors.')));
+const errorStateIcon = registerIcon('notebook-state-error', Codicon.error, ( localize(5586, 'Icon to indicate an error state in notebook editors.')));
+const pendingStateIcon = registerIcon('notebook-state-pending', Codicon.clock, ( localize(5587, 'Icon to indicate a pending state in notebook editors.')));
+const executingStateIcon = registerIcon('notebook-state-executing', Codicon.sync, ( localize(5588, 'Icon to indicate an executing state in notebook editors.')));
+const collapsedIcon = registerIcon('notebook-collapsed', Codicon.chevronRight, ( localize(5589, 'Icon to annotate a collapsed section in notebook editors.')));
+const expandedIcon = registerIcon('notebook-expanded', Codicon.chevronDown, ( localize(5590, 'Icon to annotate an expanded section in notebook editors.')));
+const openAsTextIcon = registerIcon('notebook-open-as-text', Codicon.fileCode, ( localize(5591, 'Icon to open the notebook in a text editor.')));
+const revertIcon = registerIcon('notebook-revert', Codicon.discard, ( localize(5592, 'Icon to revert in notebook editors.')));
+const toggleWhitespace = registerIcon('notebook-diff-cell-toggle-whitespace', Codicon.whitespace, ( localize(5593, 'Icon for the toggle whitespace action in the diff editor.')));
+const renderOutputIcon = registerIcon('notebook-render-output', Codicon.preview, ( localize(5594, 'Icon to render output in diff editor.')));
+const mimetypeIcon = registerIcon('notebook-mimetype', Codicon.code, ( localize(5595, 'Icon for a mime type in notebook editors.')));
+const copyIcon = registerIcon('notebook-copy', Codicon.copy, ( localize(5596, 'Icon to copy content to clipboard')));
+const previousChangeIcon = registerIcon('notebook-diff-editor-previous-change', Codicon.arrowUp, ( localize(5597, 'Icon for the previous change action in the diff editor.')));
+const nextChangeIcon = registerIcon('notebook-diff-editor-next-change', Codicon.arrowDown, ( localize(5598, 'Icon for the next change action in the diff editor.')));
+const variablesViewIcon = registerIcon('variables-view-icon', Codicon.debugAlt, ( localize(5599, 'View icon of the variables view.')));
+export { clearIcon, collapsedIcon, copyIcon, deleteCellIcon, editIcon, errorStateIcon, executeAboveIcon, executeAllIcon, executeBelowIcon, executeIcon, executingStateIcon, expandedIcon, mimetypeIcon, moveDownIcon, moveUpIcon, nextChangeIcon, openAsTextIcon, pendingStateIcon, previousChangeIcon, renderOutputIcon, revertIcon, selectKernelIcon, splitCellIcon, stopEditIcon, stopIcon, successStateIcon, toggleWhitespace, variablesViewIcon };

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

@@ -141,7 +141,7 @@ class CellEditorOptions extends CellContentPart {
             type: 'string',
             enum: ['off', 'on'],
             default: 'off',
-            markdownDescription: ( localize(11382, "Controls the display of line numbers in the cell editor."))
+            markdownDescription: ( localize(10810, "Controls the display of line numbers in the cell editor."))
         }
     }
 });
@@ -149,7 +149,7 @@ registerAction2(class ToggleLineNumberAction extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggleLineNumbers',
-            title: ( localize2(11383, 'Toggle Notebook Line Numbers')),
+            title: ( localize2(10811, 'Toggle Notebook Line Numbers')),
             precondition: NOTEBOOK_EDITOR_FOCUSED,
             menu: [
                 {
@@ -163,7 +163,7 @@ registerAction2(class ToggleLineNumberAction extends Action2 {
             f1: true,
             toggled: {
                 condition: ( (ContextKeyExpr.notEquals('config.notebook.lineNumbers', 'off'))),
-                title: ( localize(11384, "Notebook Line Numbers")),
+                title: ( localize(10812, "Notebook Line Numbers")),
             }
         });
     }
@@ -182,7 +182,7 @@ registerAction2(class ToggleActiveLineNumberAction extends NotebookMultiCellActi
     constructor() {
         super({
             id: 'notebook.cell.toggleLineNumbers',
-            title: ( localize(11385, "Show Cell Line Numbers")),
+            title: ( localize(10813, "Show Cell Line Numbers")),
             precondition: ( (ActiveEditorContext.isEqualTo(NOTEBOOK_EDITOR_ID))),
             menu: [{
                     id: MenuId.NotebookCellTitle,

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

@@ -2,7 +2,9 @@ import { __decorate, __param } from '../../../../../../../../../external/tslib/t
 import { hide, show } from '../../../../../../base/browser/dom.js';
 import { disposableTimeout } from '../../../../../../base/common/async.js';
 import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../../../base/common/numbers.js';
 import { CellContentPart } from '../cellPart.js';
+import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
 import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
 const UPDATE_EXECUTION_ORDER_GRACE_PERIOD = 200;
 let CellExecutionPart = class CellExecutionPart extends CellContentPart {
@@ -25,6 +27,9 @@ let CellExecutionPart = class CellExecutionPart extends CellContentPart {
                 this.updateExecutionOrder(this.currentCell.internalMetadata);
             }
         }));
+        this._register(this._notebookEditor.onDidScroll(() => {
+            this._updatePosition();
+        }));
     }
     didRenderCell(element) {
         this.updateExecutionOrder(element.internalMetadata, true);
@@ -55,13 +60,30 @@ let CellExecutionPart = class CellExecutionPart extends CellContentPart {
         }
     }
     updateInternalLayoutNow(element) {
-        if (element.isInputCollapsed) {
-            hide(this._executionOrderLabel);
-        }
-        else {
-            show(this._executionOrderLabel);
-            const top = element.layoutInfo.editorHeight - 22 + element.layoutInfo.statusBarHeight;
-            this._executionOrderLabel.style.top = `${top}px`;
+        this._updatePosition();
+    }
+    _updatePosition() {
+        if (this.currentCell) {
+            if (this.currentCell.isInputCollapsed) {
+                hide(this._executionOrderLabel);
+            }
+            else {
+                show(this._executionOrderLabel);
+                let top = this.currentCell.layoutInfo.editorHeight - 22 + this.currentCell.layoutInfo.statusBarHeight;
+                if (this.currentCell instanceof CodeCellViewModel) {
+                    const elementTop = this._notebookEditor.getAbsoluteTopOfElement(this.currentCell);
+                    const editorBottom = elementTop + this.currentCell.layoutInfo.outputContainerOffset;
+                    const scrollBottom = this._notebookEditor.scrollBottom;
+                    const lineHeight = 22;
+                    if (scrollBottom <= editorBottom) {
+                        const offset = editorBottom - scrollBottom;
+                        top -= offset;
+                        top = clamp(top, lineHeight + 12,
+                        this.currentCell.layoutInfo.editorHeight - lineHeight + this.currentCell.layoutInfo.statusBarHeight);
+                    }
+                }
+                this._executionOrderLabel.style.top = `${top}px`;
+            }
         }
     }
 };

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

@@ -175,13 +175,13 @@ let CellOutputElement = class CellOutputElement extends Disposable {
     }
     _renderMissingRenderer(viewModel, preferredMimeType) {
         if (!viewModel.model.outputs.length) {
-            return this._renderMessage(viewModel, ( localize(11521, "Cell has no output")));
+            return this._renderMessage(viewModel, ( localize(11582, "Cell has no output")));
         }
         if (!preferredMimeType) {
             const mimeTypes = ( (viewModel.model.outputs.map(op => op.mime)));
             const mimeTypesMessage = mimeTypes.join(', ');
             return this._renderMessage(viewModel, ( localize(
-                11522,
+                11583,
                 "No renderer could be found for output. It has the following mimetypes: {0}",
                 mimeTypesMessage
             )));
@@ -238,7 +238,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             notebookEditor: this.notebookEditor,
             $mid: MarshalledId.NotebookCellActionContext
         };
-        const pickAction = this.toolbarDisposables.add(( (new Action('notebook.output.pickMimetype', ( localize(11523, "Change Presentation")), ThemeIcon.asClassName(mimetypeIcon), undefined, async (_context) => this._pickActiveMimeTypeRenderer(outputItemDiv, notebookTextModel, kernel, this.output)))));
+        const pickAction = this.toolbarDisposables.add(( (new Action('notebook.output.pickMimetype', ( localize(11584, "Change Presentation")), ThemeIcon.asClassName(mimetypeIcon), undefined, async (_context) => this._pickActiveMimeTypeRenderer(outputItemDiv, notebookTextModel, kernel, this.output)))));
         const menuContextKeyService = this.toolbarDisposables.add(this.contextKeyService.createScoped(outputItemDiv));
         const hasHiddenOutputs = NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS.bindTo(menuContextKeyService);
         const isFirstCellOutput = NOTEBOOK_CELL_IS_FIRST_OUTPUT.bindTo(menuContextKeyService);
@@ -276,18 +276,19 @@ let CellOutputElement = class CellOutputElement extends Disposable {
                     index: index,
                     picked: index === currIndex,
                     detail: this._generateRendererInfo(mimeType.rendererId),
-                    description: index === currIndex ? ( localize(11524, "Currently Active")) : undefined
+                    description: index === currIndex ? ( localize(11585, "Currently Active")) : undefined
                 });
             }
         });
         if (( (unsupportedItems.some(m => JUPYTER_RENDERER_MIMETYPES.includes(m.id))))) {
             unsupportedItems.push({
-                label: ( localize(11525, "Install additional renderers from the marketplace")),
+                label: ( localize(11586, "Install additional renderers from the marketplace")),
                 id: 'installRenderers',
                 index: mimeTypes.length
             });
         }
-        const picker = this.quickInputService.createQuickPick();
+        const disposables = ( (new DisposableStore()));
+        const picker = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
         picker.items = [
             ...items,
             { type: 'separator' },
@@ -295,13 +296,13 @@ let CellOutputElement = class CellOutputElement extends Disposable {
         ];
         picker.activeItems = items.filter(item => !!item.picked);
         picker.placeholder = items.length !== mimeTypes.length
-            ? ( localize(11526, "Select mimetype to render for current output"))
-            : ( localize(11527, "Select mimetype to render for current output"));
+            ? ( localize(11587, "Select mimetype to render for current output"))
+            : ( localize(11588, "Select mimetype to render for current output"));
         const pick = await ( (new Promise(resolve => {
-            picker.onDidAccept(() => {
+            disposables.add(picker.onDidAccept(() => {
                 resolve(picker.selectedItems.length === 1 ? picker.selectedItems[0] : undefined);
-                picker.dispose();
-            });
+                disposables.dispose();
+            }));
             picker.show();
         })));
         if (pick === undefined || pick.index === currIndex) {
@@ -337,7 +338,7 @@ let CellOutputElement = class CellOutputElement extends Disposable {
             const displayName = renderInfo.displayName !== '' ? renderInfo.displayName : renderInfo.id;
             return `${displayName} (${renderInfo.extensionId.value})`;
         }
-        return ( localize(11528, "renderer not available"));
+        return ( localize(11589, "renderer not available"));
     }
     _validateFinalOutputHeight(synchronous) {
         if (this._outputHeightTimer !== null) {

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

@@ -6,6 +6,7 @@ import { Codicon } from '../../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../../../base/common/numbers.js';
 import { escape } from '../../../../../../base/common/strings.js';
 import { EditorOption } from '../../../../../../editor/common/config/editorOptions.js';
 import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
@@ -24,11 +25,12 @@ import { INotebookExecutionStateService } from '../../../common/notebookExecutio
 import { WordHighlighterContribution } from '../../../../../../editor/contrib/wordHighlighter/browser/wordHighlighter.js';
 import { CodeActionController } from '../../../../../../editor/contrib/codeAction/browser/codeActionController.js';
 let CodeCell = class CodeCell extends Disposable {
-    constructor(notebookEditor, viewCell, templateData, instantiationService, keybindingService, openerService, languageService, configurationService, notebookExecutionStateService) {
+    constructor(notebookEditor, viewCell, templateData, editorPool, instantiationService, keybindingService, openerService, languageService, configurationService, notebookExecutionStateService) {
         super();
         this.notebookEditor = notebookEditor;
         this.viewCell = viewCell;
         this.templateData = templateData;
+        this.editorPool = editorPool;
         this.instantiationService = instantiationService;
         this.keybindingService = keybindingService;
         this.languageService = languageService;
@@ -44,6 +46,7 @@ let CodeCell = class CodeCell extends Disposable {
         const editorHeight = this.calculateInitEditorHeight();
         this.initializeEditor(editorHeight);
         this._renderedInputCollapseState = false;
+        this.registerNotebookEditorListeners();
         this.registerViewCellLayoutChange();
         this.registerCellEditorEventListeners();
         this.registerDecorations();
@@ -198,12 +201,40 @@ let CodeCell = class CodeCell extends Disposable {
             editor.updateOptions({ readOnly: this.notebookEditor.isReadOnly, padding: this.notebookEditor.notebookOptions.computeEditorPadding(this.viewCell.internalMetadata, this.viewCell.uri) });
         }
     }
+    registerNotebookEditorListeners() {
+        this._register(this.notebookEditor.onDidScroll(() => {
+            this.adjustEditorPosition();
+        }));
+        this._register(this.notebookEditor.onDidChangeLayout(() => {
+            this.adjustEditorPosition();
+            this.onCellWidthChange();
+        }));
+    }
+    adjustEditorPosition() {
+        const extraOffset = -6  - 1 ;
+        const min = 0;
+        const scrollTop = this.notebookEditor.scrollTop;
+        const elementTop = this.notebookEditor.getAbsoluteTopOfElement(this.viewCell);
+        const diff = scrollTop - elementTop + extraOffset;
+        const notebookEditorLayout = this.notebookEditor.getLayoutInfo();
+        const editorMaxHeight = notebookEditorLayout.height
+            - notebookEditorLayout.stickyHeight
+            - 26 ;
+        const maxTop = this.viewCell.layoutInfo.editorHeight
+            - editorMaxHeight;
+        const top = maxTop > 20 ?
+            clamp(min, diff, maxTop) :
+            min;
+        this.templateData.editorPart.style.top = `${top}px`;
+        this.templateData.editor?.setScrollTop(top);
+    }
     registerViewCellLayoutChange() {
         this._register(this.viewCell.onDidChangeLayout((e) => {
             if (e.outerWidth !== undefined) {
                 const layoutInfo = this.templateData.editor.getLayoutInfo();
                 if (layoutInfo.width !== this.viewCell.layoutInfo.editorWidth) {
                     this.onCellWidthChange();
+                    this.adjustEditorPosition();
                 }
             }
         }));
@@ -213,6 +244,7 @@ let CodeCell = class CodeCell extends Disposable {
             if (e.contentHeightChanged) {
                 if (this.viewCell.layoutInfo.editorHeight !== e.contentHeight) {
                     this.onCellEditorHeightChange(e.contentHeight);
+                    this.adjustEditorPosition();
                 }
             }
         }));
@@ -287,13 +319,13 @@ let CodeCell = class CodeCell extends Disposable {
             }
         }));
     }
-    shouldUpdateDOMFocus() {
+    shouldPreserveEditor() {
         return this.notebookEditor.getActiveCell() === this.viewCell
             && this.viewCell.focusMode === CellFocusMode.Editor
             && (this.notebookEditor.hasEditorFocus() || this.notebookEditor.getDomNode().ownerDocument.activeElement === this.notebookEditor.getDomNode().ownerDocument.body);
     }
     updateEditorForFocusModeChange(sync) {
-        if (this.shouldUpdateDOMFocus()) {
+        if (this.shouldPreserveEditor()) {
             if (sync) {
                 this.templateData.editor?.focus();
             }
@@ -346,8 +378,8 @@ let CodeCell = class CodeCell extends Disposable {
         const expandIcon = $('span.expandInputIcon');
         const keybinding = this.keybindingService.lookupKeybinding(EXPAND_CELL_INPUT_COMMAND_ID);
         if (keybinding) {
-            element.title = ( localize(11386, "Double-click to expand cell input ({0})", keybinding.getLabel()));
-            expandIcon.title = ( localize(11387, "Expand Cell Input ({0})", keybinding.getLabel()));
+            element.title = ( localize(11463, "Double-click to expand cell input ({0})", keybinding.getLabel()));
+            expandIcon.title = ( localize(11464, "Expand Cell Input ({0})", keybinding.getLabel()));
         }
         expandIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.more));
         element.appendChild(expandIcon);
@@ -415,7 +447,14 @@ let CodeCell = class CodeCell extends Disposable {
         this._showOutput(true);
     }
     layoutEditor(dimension) {
-        this.templateData.editor?.layout(dimension, true);
+        const editorLayout = this.notebookEditor.getLayoutInfo();
+        const maxHeight = Math.min(editorLayout.height
+            - editorLayout.stickyHeight
+            - 26 , dimension.height);
+        this.templateData.editor?.layout({
+            width: dimension.width,
+            height: maxHeight
+        }, true);
     }
     onCellWidthChange() {
         if (!this.templateData.editor.hasModel()) {
@@ -443,8 +482,8 @@ let CodeCell = class CodeCell extends Disposable {
     }
     dispose() {
         this._isDisposed = true;
-        if (this.shouldUpdateDOMFocus()) {
-            this.notebookEditor.focusContainer();
+        if (this.shouldPreserveEditor()) {
+            this.editorPool.preserveFocusedEditor(this.viewCell);
         }
         this.viewCell.detachTextEditor();
         this._removeInputCollapsePreview();
@@ -454,11 +493,11 @@ let CodeCell = class CodeCell extends Disposable {
     }
 };
 CodeCell = ( (__decorate([
-    ( (__param(3, IInstantiationService))),
-    ( (__param(4, IKeybindingService))),
-    ( (__param(5, IOpenerService))),
-    ( (__param(6, ILanguageService))),
-    ( (__param(7, IConfigurationService))),
-    ( (__param(8, INotebookExecutionStateService)))
+    ( (__param(4, IInstantiationService))),
+    ( (__param(5, IKeybindingService))),
+    ( (__param(6, IOpenerService))),
+    ( (__param(7, ILanguageService))),
+    ( (__param(8, IConfigurationService))),
+    ( (__param(9, INotebookExecutionStateService)))
 ], CodeCell)));
 export { CodeCell };