@codingame/monaco-vscode-notebook-service-override 17.2.0 → 18.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/editActions.js

@@ -21,15 +21,15 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { InlineChatController } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController } from '@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { CTX_INLINE_CHAT_FOCUSED } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { runDeleteAction, changeCellToKind } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { NotebookCellAction, CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, findTargetCellEditor, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, CELL_TITLE_OUTPUT_GROUP_ID, executeNotebookCondition, NotebookAction, NotebookMultiCellAction } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { NotebookCellAction, CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, findTargetCellEditor, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, CELL_TITLE_OUTPUT_GROUP_ID, executeNotebookCondition, NotebookAction, NotebookMultiCellAction } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { NotebookIndentUsingTabs, NotebookIndentUsingSpaces, NotebookChangeTabDisplaySize, NotebookIndentationToTabsAction, NotebookIndentationToSpacesAction } from './notebookIndentationActions.js';
-import { QUIT_EDIT_CELL_COMMAND_ID, CellEditState, CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE, getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { editIcon, stopEditIcon, deleteCellIcon, clearIcon } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { QUIT_EDIT_CELL_COMMAND_ID, CellEditState, CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE, getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { editIcon, stopEditIcon, deleteCellIcon, clearIcon } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellKind, NotebookCellExecutionState, NotebookSetting, CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_CELL_IS_FIRST_OUTPUT, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_HAS_OUTPUTS } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_CELL_IS_FIRST_OUTPUT, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_HAS_OUTPUTS } from '@codingame/monaco-vscode-c87fff3a-2aa9-52ab-ba4d-17e8d1e5e185-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -46,7 +46,7 @@ registerAction2(class EditCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: EDIT_CELL_COMMAND_ID,
-            title: ( localize(8083, "Edit Cell")),
+            title: ( localize(8314, "Edit Cell")),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
@@ -82,7 +82,7 @@ registerAction2(class QuitEditCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: QUIT_EDIT_CELL_COMMAND_ID,
-            title: ( localize(8084, "Stop Editing Cell")),
+            title: ( localize(8315, "Stop Editing Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(( NOTEBOOK_CELL_TYPE.isEqualTo('markup')), NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EDITABLE)),
@@ -123,7 +123,7 @@ registerAction2(class DeleteCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: DELETE_CELL_COMMAND_ID,
-            title: ( localize(8085, "Delete Cell")),
+            title: ( localize(8316, "Delete Cell")),
             keybinding: {
                 primary: KeyCode.Delete,
                 mac: {
@@ -160,13 +160,13 @@ registerAction2(class DeleteCellAction extends NotebookCellAction {
         const configService = accessor.get(IConfigurationService);
         if (runState === NotebookCellExecutionState.Executing && configService.getValue(NotebookSetting.confirmDeleteRunningCell)) {
             const dialogService = accessor.get(IDialogService);
-            const primaryButton = ( localize(8086, "Delete"));
+            const primaryButton = ( localize(8317, "Delete"));
             confirmation = await dialogService.confirm({
                 type: 'question',
-                message: ( localize(8087, "This cell is running, are you sure you want to delete it?")),
+                message: ( localize(8318, "This cell is running, are you sure you want to delete it?")),
                 primaryButton: primaryButton,
                 checkbox: {
-                    label: ( localize(8088, "Do not ask me again"))
+                    label: ( localize(8319, "Do not ask me again"))
                 }
             });
         }
@@ -186,7 +186,7 @@ registerAction2(class ClearCellOutputsAction extends NotebookCellAction {
     constructor() {
         super({
             id: CLEAR_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize(8089, 'Clear Cell Outputs')),
+            title: ( localize(8320, 'Clear Cell Outputs')),
             menu: [
                 {
                     id: MenuId.NotebookCellTitle,
@@ -250,7 +250,7 @@ registerAction2(class ClearAllCellOutputsAction extends NotebookAction {
     constructor() {
         super({
             id: CLEAR_ALL_CELLS_OUTPUTS_COMMAND_ID,
-            title: ( localize(8090, 'Clear All Outputs')),
+            title: ( localize(8321, 'Clear All Outputs')),
             precondition: NOTEBOOK_HAS_OUTPUTS,
             menu: [
                 {
@@ -307,14 +307,14 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
     constructor() {
         super({
             id: CHANGE_CELL_LANGUAGE,
-            title: ( localize(8091, 'Change Cell Language')),
+            title: ( localize(8322, 'Change Cell Language')),
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
                 primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyM),
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE))
             },
             metadata: {
-                description: ( localize(8091, 'Change Cell Language')),
+                description: ( localize(8322, 'Change Cell Language')),
                 args: [
                     {
                         name: 'range',
@@ -387,10 +387,10 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
         providerLanguages.forEach(languageId => {
             let description;
             if (context.cell.cellKind === CellKind.Markup ? (languageId === 'markdown') : (languageId === context.cell.language)) {
-                description = ( localize(8092, "({0}) - Current Language", languageId));
+                description = ( localize(8323, "({0}) - Current Language", languageId));
             }
             else {
-                description = ( localize(8093, "({0})", languageId));
+                description = ( localize(8324, "({0})", languageId));
             }
             const languageName = languageService.getLanguageName(languageId);
             if (!languageName) {
@@ -413,16 +413,16 @@ registerAction2(class ChangeCellLanguageAction extends NotebookCellAction {
             return a.description.localeCompare(b.description);
         });
         const autoDetectMode = {
-            label: ( localize(8094, "Auto Detect"))
+            label: ( localize(8325, "Auto Detect"))
         };
         const picks = [
             autoDetectMode,
-            { type: 'separator', label: ( localize(8095, "languages (identifier)")) },
+            { type: 'separator', label: ( localize(8326, "languages (identifier)")) },
             ...topItems,
             { type: 'separator' },
             ...mainItems
         ];
-        const selection = await quickInputService.pick(picks, { placeHolder: ( localize(8096, "Select Language Mode")) });
+        const selection = await quickInputService.pick(picks, { placeHolder: ( localize(8327, "Select Language Mode")) });
         const languageId = selection === autoDetectMode
             ? await languageDetectionService.detectLanguage(context.cell.uri)
             : selection?.languageId;
@@ -455,7 +455,7 @@ registerAction2(class DetectCellLanguageAction extends NotebookCellAction {
     constructor() {
         super({
             id: DETECT_CELL_LANGUAGE,
-            title: ( localize2(8097, "Accept Detected Language for Cell")),
+            title: ( localize2(8328, "Accept Detected Language for Cell")),
             f1: true,
             precondition: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE)),
             keybinding: { primary: KeyCode.KeyD | KeyMod.Alt | KeyMod.Shift, weight: KeybindingWeight.WorkbenchContrib }
@@ -473,7 +473,7 @@ registerAction2(class DetectCellLanguageAction extends NotebookCellAction {
             setCellToLanguage(detection, context);
         }
         else {
-            notificationService.warn(( localize(8098, "Unable to detect cell language")));
+            notificationService.warn(( localize(8329, "Unable to detect cell language")));
         }
     }
 });
@@ -498,7 +498,7 @@ registerAction2(class SelectNotebookIndentation extends NotebookAction {
     constructor() {
         super({
             id: SELECT_NOTEBOOK_INDENTATION_ID,
-            title: ( localize2(8099, 'Select Indentation')),
+            title: ( localize2(8330, 'Select Indentation')),
             f1: true,
             precondition: ( ContextKeyExpr.and(
                 NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -516,10 +516,10 @@ registerAction2(class SelectNotebookIndentation extends NotebookAction {
         const instantiationService = accessor.get(IInstantiationService);
         const activeNotebook = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
         if (!activeNotebook || activeNotebook.isDisposed) {
-            return quickInputService.pick([{ label: ( localize(8100, "No notebook editor active at this time")) }]);
+            return quickInputService.pick([{ label: ( localize(8331, "No notebook editor active at this time")) }]);
         }
         if (activeNotebook.isReadOnly) {
-            return quickInputService.pick([{ label: ( localize(8101, "The active notebook editor is read-only.")) }]);
+            return quickInputService.pick([{ label: ( localize(8332, "The active notebook editor is read-only.")) }]);
         }
         const picks = ( [
             (
@@ -541,9 +541,9 @@ registerAction2(class SelectNotebookIndentation extends NotebookAction {
                 }
             };
         }));
-        picks.splice(3, 0, { type: 'separator', label: ( localize(8102, "convert file")) });
-        picks.unshift({ type: 'separator', label: ( localize(8103, "change view")) });
-        const action = await quickInputService.pick(picks, { placeHolder: ( localize(8104, "Select Action")), matchOnDetail: true });
+        picks.splice(3, 0, { type: 'separator', label: ( localize(8333, "convert file")) });
+        picks.unshift({ type: 'separator', label: ( localize(8334, "change view")) });
+        const action = await quickInputService.pick(picks, { placeHolder: ( localize(8335, "Select Action")), matchOnDetail: true });
         if (!action) {
             return;
         }
@@ -556,7 +556,7 @@ registerAction2(class CommentSelectedCellsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: COMMENT_SELECTED_CELLS_ID,
-            title: ( localize(8105, "Comment Selected Cells")),
+            title: ( localize(8336, "Comment Selected Cells")),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/executeActions.js

@@ -13,15 +13,16 @@ import { IDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { CTX_INLINE_CHAT_FOCUSED } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { insertCell } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
 import { NotebookChatController } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
-import { NotebookAction, getContextFromUri, getContextFromActiveEditor, NotebookMultiCellAction, cellExecutionArgs, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, parseMultiCellExecutionArgs, CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, NotebookCellAction } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { CellEditState, EXECUTE_CELL_COMMAND_ID, ScrollToRevealBehavior, CellFocusMode } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { executeAllIcon, executeIcon, executeAboveIcon, executeBelowIcon, stopIcon, executingStateIcon, errorStateIcon } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { NotebookAction, getContextFromUri, getContextFromActiveEditor, NotebookMultiCellAction, cellExecutionArgs, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, parseMultiCellExecutionArgs, CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, NotebookCellAction } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { CellEditState, EXECUTE_CELL_COMMAND_ID, ScrollToRevealBehavior, CellFocusMode } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { executeAllIcon, executeIcon, executeAboveIcon, executeBelowIcon, stopIcon, executingStateIcon, errorStateIcon } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellKind, NotebookSetting, CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_CELL_TYPE, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_LAST_CELL_FAILED } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { NotebookEditorInput } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { NOTEBOOK_CELL_TYPE, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_LAST_CELL_FAILED } from '@codingame/monaco-vscode-c87fff3a-2aa9-52ab-ba4d-17e8d1e5e185-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { CodeCellViewModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 
 const EXECUTE_NOTEBOOK_COMMAND_ID = 'notebook.execute';
 const CANCEL_NOTEBOOK_COMMAND_ID = 'notebook.cancelExecution';
@@ -50,28 +51,29 @@ function renderAllMarkdownCells(context) {
         }
     }
 }
-async function runCell(editorGroupsService, context) {
+async function runCell(editorGroupsService, context, editorService) {
     const group = editorGroupsService.activeGroup;
     if (group) {
         if (group.activeEditor) {
             group.pinEditor(group.activeEditor);
         }
     }
+    if (context.autoReveal && (context.cell || context.selectedCells?.length) && editorService) {
+        editorService.openEditor({ resource: context.notebookEditor.textModel.uri, options: { revealIfOpened: true } });
+    }
     if (context.ui && context.cell) {
-        await context.notebookEditor.executeNotebookCells(Iterable.single(context.cell));
         if (context.autoReveal) {
-            const cellIndex = context.notebookEditor.getCellIndex(context.cell);
-            context.notebookEditor.revealCellRangeInView({ start: cellIndex, end: cellIndex + 1 });
+            handleAutoReveal(context.cell, context.notebookEditor);
         }
+        await context.notebookEditor.executeNotebookCells(Iterable.single(context.cell));
     }
     else if (context.selectedCells?.length || context.cell) {
         const selectedCells = context.selectedCells?.length ? context.selectedCells : [context.cell];
-        await context.notebookEditor.executeNotebookCells(selectedCells);
         const firstCell = selectedCells[0];
         if (firstCell && context.autoReveal) {
-            const cellIndex = context.notebookEditor.getCellIndex(firstCell);
-            context.notebookEditor.revealCellRangeInView({ start: cellIndex, end: cellIndex + 1 });
+            handleAutoReveal(firstCell, context.notebookEditor);
         }
+        await context.notebookEditor.executeNotebookCells(selectedCells);
     }
     let foundEditor = undefined;
     for (const [, codeEditor] of context.notebookEditor.codeEditors) {
@@ -84,11 +86,56 @@ async function runCell(editorGroupsService, context) {
         return;
     }
 }
+const SMART_VIEWPORT_TOP_REVEAL_PADDING = 20;
+const SMART_VIEWPORT_BOTTOM_REVEAL_PADDING = 60;
+function handleAutoReveal(cell, notebookEditor) {
+    notebookEditor.focusNotebookCell(cell, 'container', { skipReveal: true });
+    if (cell.cellKind === CellKind.Markup) {
+        const cellIndex = notebookEditor.getCellIndex(cell);
+        notebookEditor.revealCellRangeInView({ start: cellIndex, end: cellIndex + 1 });
+        return;
+    }
+    if (!(cell instanceof CodeCellViewModel)) {
+        return;
+    }
+    const cellEditorScrollTop = notebookEditor.getAbsoluteTopOfElement(cell);
+    const cellEditorScrollBottom = cellEditorScrollTop + cell.layoutInfo.outputContainerOffset;
+    const cellOutputHeight = cell.layoutInfo.outputTotalHeight;
+    const cellOutputScrollBottom = notebookEditor.getAbsoluteBottomOfElement(cell);
+    const viewportHeight = notebookEditor.getLayoutInfo().height;
+    const viewportHeight34 = viewportHeight * 0.34;
+    const viewportHeight66 = viewportHeight * 0.66;
+    const totalHeight = cell.layoutInfo.totalHeight;
+    const isFullyVisible = cellEditorScrollTop >= notebookEditor.scrollTop && cellOutputScrollBottom <= notebookEditor.scrollBottom;
+    const isEditorBottomVisible = (((cellEditorScrollBottom - 25) ) >= notebookEditor.scrollTop) &&
+        (((cellEditorScrollBottom + 25) ) <= notebookEditor.scrollBottom);
+    const revealWithTopPadding = (position) => { notebookEditor.setScrollTop(position - SMART_VIEWPORT_TOP_REVEAL_PADDING); };
+    const revealWithNoPadding = (position) => { notebookEditor.setScrollTop(position); };
+    const revealWithBottomPadding = (position) => { notebookEditor.setScrollTop(position + SMART_VIEWPORT_BOTTOM_REVEAL_PADDING); };
+    if (isFullyVisible) {
+        return;
+    }
+    if (totalHeight <= viewportHeight && !isEditorBottomVisible) {
+        revealWithTopPadding(cellEditorScrollTop);
+        return;
+    }
+    if (totalHeight > viewportHeight && !isEditorBottomVisible) {
+        if (cellOutputHeight > 0 && cellOutputHeight >= viewportHeight66) {
+            revealWithNoPadding(cellEditorScrollBottom - viewportHeight34);
+        }
+        else if (cellOutputHeight > 0) {
+            revealWithBottomPadding(cellOutputScrollBottom - viewportHeight);
+        }
+        else {
+            revealWithNoPadding(cellEditorScrollBottom - viewportHeight66);
+        }
+    }
+}
 registerAction2(class RenderAllMarkdownCellsAction extends NotebookAction {
     constructor() {
         super({
             id: RENDER_ALL_MARKDOWN_CELLS,
-            title: ( localize(8106, "Render All Markdown Cells")),
+            title: ( localize(8337, "Render All Markdown Cells")),
         });
     }
     async runWithContext(accessor, context) {
@@ -99,10 +146,10 @@ registerAction2(class ExecuteNotebookAction extends NotebookAction {
     constructor() {
         super({
             id: EXECUTE_NOTEBOOK_COMMAND_ID,
-            title: ( localize(8107, "Run All")),
+            title: ( localize(8338, "Run All")),
             icon: executeAllIcon,
             metadata: {
-                description: ( localize(8107, "Run All")),
+                description: ( localize(8338, "Run All")),
                 args: [
                     {
                         name: 'uri',
@@ -146,7 +193,7 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
         super({
             id: EXECUTE_CELL_COMMAND_ID,
             precondition: executeThisCellCondition,
-            title: ( localize(8108, "Execute Cell")),
+            title: ( localize(8339, "Execute Cell")),
             keybinding: {
                 when: NOTEBOOK_CELL_LIST_FOCUSED,
                 primary: KeyMod.WinCtrl | KeyCode.Enter,
@@ -161,7 +208,7 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
                 group: 'inline'
             },
             metadata: {
-                description: ( localize(8108, "Execute Cell")),
+                description: ( localize(8339, "Execute Cell")),
                 args: cellExecutionArgs
             },
             icon: executeIcon
@@ -172,6 +219,7 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
     }
     async runWithContext(accessor, context) {
         const editorGroupsService = accessor.get(IEditorGroupsService);
+        const editorService = accessor.get(IEditorService);
         if (context.ui) {
             await context.notebookEditor.focusNotebookCell(context.cell, 'container', { skipReveal: true });
         }
@@ -187,7 +235,7 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
             await context.notebookEditor.executeNotebookCells([editingCell]);
             return;
         }
-        await runCell(editorGroupsService, context);
+        await runCell(editorGroupsService, context, editorService);
     }
 });
 registerAction2(class ExecuteAboveCells extends NotebookMultiCellAction {
@@ -195,7 +243,7 @@ registerAction2(class ExecuteAboveCells extends NotebookMultiCellAction {
         super({
             id: EXECUTE_CELLS_ABOVE,
             precondition: executeCondition,
-            title: ( localize(8109, "Execute Above Cells")),
+            title: ( localize(8340, "Execute Above Cells")),
             menu: [
                 {
                     id: MenuId.NotebookCellExecute,
@@ -235,7 +283,7 @@ registerAction2(class ExecuteCellAndBelow extends NotebookMultiCellAction {
         super({
             id: EXECUTE_CELL_AND_BELOW,
             precondition: executeCondition,
-            title: ( localize(8110, "Execute Cell and Below")),
+            title: ( localize(8341, "Execute Cell and Below")),
             menu: [
                 {
                     id: MenuId.NotebookCellExecute,
@@ -275,9 +323,9 @@ registerAction2(class ExecuteCellFocusContainer extends NotebookMultiCellAction
         super({
             id: EXECUTE_CELL_FOCUS_CONTAINER_COMMAND_ID,
             precondition: executeThisCellCondition,
-            title: ( localize(8111, "Execute Cell and Focus Container")),
+            title: ( localize(8342, "Execute Cell and Focus Container")),
             metadata: {
-                description: ( localize(8111, "Execute Cell and Focus Container")),
+                description: ( localize(8342, "Execute Cell and Focus Container")),
                 args: cellExecutionArgs
             },
             icon: executeIcon
@@ -288,6 +336,7 @@ registerAction2(class ExecuteCellFocusContainer extends NotebookMultiCellAction
     }
     async runWithContext(accessor, context) {
         const editorGroupsService = accessor.get(IEditorGroupsService);
+        const editorService = accessor.get(IEditorService);
         if (context.ui) {
             await context.notebookEditor.focusNotebookCell(context.cell, 'container', { skipReveal: true });
         }
@@ -297,7 +346,7 @@ registerAction2(class ExecuteCellFocusContainer extends NotebookMultiCellAction
                 await context.notebookEditor.focusNotebookCell(firstCell, 'container', { skipReveal: true });
             }
         }
-        await runCell(editorGroupsService, context);
+        await runCell(editorGroupsService, context, editorService);
     }
 });
 const cellCancelCondition = ( ContextKeyExpr.or(( ContextKeyExpr.equals(NOTEBOOK_CELL_EXECUTION_STATE.key, 'executing')), ( ContextKeyExpr.equals(NOTEBOOK_CELL_EXECUTION_STATE.key, 'pending'))));
@@ -306,7 +355,7 @@ registerAction2(class CancelExecuteCell extends NotebookMultiCellAction {
         super({
             id: CANCEL_CELL_COMMAND_ID,
             precondition: cellCancelCondition,
-            title: ( localize(8112, "Stop Cell Execution")),
+            title: ( localize(8343, "Stop Cell Execution")),
             icon: stopIcon,
             menu: {
                 id: MenuId.NotebookCellExecutePrimary,
@@ -314,7 +363,7 @@ registerAction2(class CancelExecuteCell extends NotebookMultiCellAction {
                 group: 'inline'
             },
             metadata: {
-                description: ( localize(8112, "Stop Cell Execution")),
+                description: ( localize(8343, "Stop Cell Execution")),
                 args: [
                     {
                         name: 'options',
@@ -369,7 +418,7 @@ registerAction2(class ExecuteCellSelectBelow extends NotebookCellAction {
         super({
             id: EXECUTE_CELL_SELECT_BELOW,
             precondition: ( ContextKeyExpr.or(executeThisCellCondition, ( NOTEBOOK_CELL_TYPE.isEqualTo('markup')))),
-            title: ( localize(8113, "Execute Notebook Cell and Select Below")),
+            title: ( localize(8344, "Execute Notebook Cell and Select Below")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( CTX_INLINE_CHAT_FOCUSED.negate()))),
                 primary: KeyMod.Shift | KeyCode.Enter,
@@ -379,6 +428,7 @@ registerAction2(class ExecuteCellSelectBelow extends NotebookCellAction {
     }
     async runWithContext(accessor, context) {
         const editorGroupsService = accessor.get(IEditorGroupsService);
+        const editorService = accessor.get(IEditorService);
         const idx = context.notebookEditor.getCellIndex(context.cell);
         if (typeof idx !== 'number') {
             return;
@@ -420,7 +470,7 @@ registerAction2(class ExecuteCellSelectBelow extends NotebookCellAction {
                     await context.notebookEditor.focusNotebookCell(newCell, 'editor', focusOptions);
                 }
             }
-            return runCell(editorGroupsService, context);
+            return runCell(editorGroupsService, context, editorService);
         }
     }
 });
@@ -429,7 +479,7 @@ registerAction2(class ExecuteCellInsertBelow extends NotebookCellAction {
         super({
             id: EXECUTE_CELL_INSERT_BELOW,
             precondition: ( ContextKeyExpr.or(executeThisCellCondition, ( NOTEBOOK_CELL_TYPE.isEqualTo('markup')))),
-            title: ( localize(8114, "Execute Notebook Cell and Insert Below")),
+            title: ( localize(8345, "Execute Notebook Cell and Insert Below")),
             keybinding: {
                 when: NOTEBOOK_CELL_LIST_FOCUSED,
                 primary: KeyMod.Alt | KeyCode.Enter,
@@ -439,6 +489,7 @@ registerAction2(class ExecuteCellInsertBelow extends NotebookCellAction {
     }
     async runWithContext(accessor, context) {
         const editorGroupsService = accessor.get(IEditorGroupsService);
+        const editorService = accessor.get(IEditorService);
         const idx = context.notebookEditor.getCellIndex(context.cell);
         const languageService = accessor.get(ILanguageService);
         const newFocusMode = context.cell.focusMode === CellFocusMode.Editor ? 'editor' : 'container';
@@ -450,7 +501,7 @@ registerAction2(class ExecuteCellInsertBelow extends NotebookCellAction {
             context.cell.updateEditState(CellEditState.Preview, EXECUTE_CELL_INSERT_BELOW);
         }
         else {
-            runCell(editorGroupsService, context);
+            runCell(editorGroupsService, context, editorService);
         }
     }
 });
@@ -466,7 +517,7 @@ registerAction2(class CancelAllNotebook extends CancelNotebook {
     constructor() {
         super({
             id: CANCEL_NOTEBOOK_COMMAND_ID,
-            title: ( localize2(8115, "Stop Execution")),
+            title: ( localize2(8346, "Stop Execution")),
             icon: stopIcon,
             menu: [
                 {
@@ -489,7 +540,7 @@ registerAction2(class InterruptNotebook extends CancelNotebook {
     constructor() {
         super({
             id: INTERRUPT_NOTEBOOK_COMMAND_ID,
-            title: ( localize2(8116, "Interrupt")),
+            title: ( localize2(8347, "Interrupt")),
             precondition: ( ContextKeyExpr.and(NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL)),
             icon: stopIcon,
             menu: [
@@ -523,7 +574,7 @@ registerAction2(class InterruptNotebook extends CancelNotebook {
     }
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
-    title: ( localize(8117, "Go To")),
+    title: ( localize(8348, "Go To")),
     submenu: MenuId.NotebookCellExecuteGoTo,
     group: 'navigation/execute',
     order: 20,
@@ -533,9 +584,9 @@ registerAction2(class RevealRunningCellAction extends NotebookAction {
     constructor() {
         super({
             id: REVEAL_RUNNING_CELL,
-            title: ( localize(8118, "Go to Running Cell")),
-            tooltip: ( localize(8118, "Go to Running Cell")),
-            shortTitle: ( localize(8118, "Go to Running Cell")),
+            title: ( localize(8349, "Go to Running Cell")),
+            tooltip: ( localize(8349, "Go to Running Cell")),
+            shortTitle: ( localize(8349, "Go to Running Cell")),
             precondition: NOTEBOOK_HAS_RUNNING_CELL,
             menu: [
                 {
@@ -593,9 +644,9 @@ registerAction2(class RevealLastFailedCellAction extends NotebookAction {
     constructor() {
         super({
             id: REVEAL_LAST_FAILED_CELL,
-            title: ( localize(8119, "Go to Most Recently Failed Cell")),
-            tooltip: ( localize(8119, "Go to Most Recently Failed Cell")),
-            shortTitle: ( localize(8120, "Go to Most Recently Failed Cell")),
+            title: ( localize(8350, "Go to Most Recently Failed Cell")),
+            tooltip: ( localize(8350, "Go to Most Recently Failed Cell")),
+            shortTitle: ( localize(8351, "Go to Most Recently Failed Cell")),
             precondition: NOTEBOOK_LAST_CELL_FAILED,
             menu: [
                 {

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/insertCellActions.d.ts

@@ -1,6 +1,6 @@
 import { IAction2Options } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { INotebookActionContext, NotebookAction } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions";
+import { INotebookActionContext, NotebookAction } from "@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions";
 import { CellViewModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl";
 import { CellKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 export declare function insertNewCell(accessor: ServicesAccessor, context: INotebookActionContext, kind: CellKind, direction: "above" | "below", focusEditor: boolean): CellViewModel | null;