@codingame/monaco-vscode-notebook-service-override 3.2.2 → 4.0.0

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

@@ -1,4 +1,5 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
@@ -6,12 +7,12 @@ import { registerAction2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE, CTX_INLINE_CHAT_HAS_PROVIDER } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
-import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, MENU_CELL_CHAT_INPUT, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, MENU_CELL_CHAT_WIDGET, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, MENU_CELL_CHAT_WIDGET_STATUS, MENU_CELL_CHAT_WIDGET_FEEDBACK } from './notebookChatContext.js';
-import { NotebookChatController } from './notebookChatController.js';
-import { NotebookAction, NotebookCellAction, getEditorFromArgsOrActivePane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, MENU_CELL_CHAT_INPUT, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, MENU_CELL_CHAT_WIDGET, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, MENU_CELL_CHAT_WIDGET_STATUS, MENU_CELL_CHAT_WIDGET_FEEDBACK } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
+import { NotebookChatController } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
+import { NotebookAction, NotebookCellAction, getEditorFromArgsOrActivePane, CELL_TITLE_CELL_GROUP_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellKind, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_GENERATED_BY_CHAT } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
 registerAction2(class extends NotebookAction {
     constructor() {
@@ -24,13 +25,13 @@ registerAction2(class extends NotebookAction {
             )),
             icon: Codicon.send,
             keybinding: {
-                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
-                weight: 0  + 7,
+                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
+                weight: 200 ,
                 primary: 3
             },
             menu: {
                 id: MENU_CELL_CHAT_INPUT,
-                group: 'main',
+                group: 'navigation',
                 order: 1,
                 when: ( CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST.negate())
             }
@@ -54,6 +55,7 @@ registerAction2(class extends NotebookCellAction {
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
                     CTX_INLINE_CHAT_FOCUSED,
                     CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
+                    ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
                     ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
                 )),
                 weight: 0  + 7,
@@ -91,6 +93,7 @@ registerAction2(class extends NotebookAction {
                     CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
                     CTX_INLINE_CHAT_FOCUSED,
                     CTX_INLINE_CHAT_INNER_CURSOR_LAST,
+                    ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
                     ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
                 )),
                 weight: 0  + 7,
@@ -156,7 +159,7 @@ registerAction2(class extends NotebookAction {
             icon: Codicon.debugStop,
             menu: {
                 id: MENU_CELL_CHAT_INPUT,
-                group: 'main',
+                group: 'navigation',
                 order: 1,
                 when: CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST
             }
@@ -178,13 +181,13 @@ registerAction2(class extends NotebookAction {
             icon: Codicon.close,
             menu: {
                 id: MENU_CELL_CHAT_WIDGET,
-                group: 'main',
+                group: 'navigation',
                 order: 2
             }
         });
     }
     async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.dismiss();
+        NotebookChatController.get(context.notebookEditor)?.dismiss(false);
     }
 });
 registerAction2(class extends NotebookAction {
@@ -209,7 +212,7 @@ registerAction2(class extends NotebookAction {
             )),
             keybinding: [
                 {
-                    when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
+                    when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
                     weight: 100  + 10,
                     primary: 2048  | 3 ,
                 },
@@ -217,7 +220,8 @@ registerAction2(class extends NotebookAction {
                     when: ( ContextKeyExpr.and(
                         CTX_NOTEBOOK_CELL_CHAT_FOCUSED,
                         CTX_INLINE_CHAT_FOCUSED,
-                        CTX_NOTEBOOK_CHAT_USER_DID_EDIT
+                        CTX_NOTEBOOK_CHAT_USER_DID_EDIT,
+                        ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
                     )),
                     weight: 0  + 10,
                     primary: 9
@@ -226,6 +230,7 @@ registerAction2(class extends NotebookAction {
                     when: ( ContextKeyExpr.and(
                         NOTEBOOK_EDITOR_FOCUSED,
                         ContextKeyExpr.not(InputFocusedContextKey),
+                        ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
                         ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
                     )),
                     primary: 2048  | 3 ,
@@ -257,7 +262,7 @@ registerAction2(class extends NotebookAction {
             )),
             icon: Codicon.discard,
             keybinding: {
-                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( CTX_NOTEBOOK_CHAT_USER_DID_EDIT.negate()))),
+                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED, ( CTX_NOTEBOOK_CHAT_USER_DID_EDIT.negate()), ( NOTEBOOK_CELL_EDITOR_FOCUSED.negate()))),
                 weight: 100 ,
                 primary: 9
             },
@@ -341,7 +346,7 @@ registerAction2(class extends NotebookAction {
 registerAction2(class extends NotebookAction {
     constructor() {
         super({
-            id: 'notebook.cell.insertCodeCellWithChat',
+            id: 'notebook.cell.chat.start',
             title: {
                 value: '$(sparkle) ' + ( localizeWithPath(
                     'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
@@ -353,13 +358,13 @@ registerAction2(class extends NotebookAction {
             tooltip: ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
                 'notebookActions.menu.insertCodeCellWithChat.tooltip',
-                "Generate Code Cell with Chat"
+                "Start Chat to Generate Code"
             )),
             metadata: {
                 description: ( localizeWithPath(
                     'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
                     'notebookActions.menu.insertCodeCellWithChat.tooltip',
-                    "Generate Code Cell with Chat"
+                    "Start Chat to Generate Code"
                 )),
                 args: [
                     {
@@ -383,6 +388,12 @@ registerAction2(class extends NotebookAction {
                 ]
             },
             f1: false,
+            keybinding: {
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ContextKeyExpr.not(InputFocusedContextKey), CTX_INLINE_CHAT_HAS_PROVIDER, ( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)))),
+                weight: 200 ,
+                primary: 2048  | 39 ,
+                secondary: [KeyChord(2048  | 41 , 39 )],
+            },
             menu: [
                 {
                     id: MenuId.NotebookCellBetween,
@@ -435,7 +446,7 @@ registerAction2(class extends NotebookAction {
 registerAction2(class extends NotebookAction {
     constructor() {
         super({
-            id: 'notebook.cell.insertCodeCellWithChatAtTop',
+            id: 'notebook.cell.chat.startAtTop',
             title: {
                 value: '$(sparkle) ' + ( localizeWithPath(
                     'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
@@ -447,7 +458,7 @@ registerAction2(class extends NotebookAction {
             tooltip: ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
                 'notebookActions.menu.insertCodeCellWithChat.tooltip',
-                "Generate Code Cell with Chat"
+                "Start Chat to Generate Code"
             )),
             f1: false,
             menu: [
@@ -467,7 +478,7 @@ registerAction2(class extends NotebookAction {
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
-        id: 'notebook.cell.insertCodeCellWithChat',
+        id: 'notebook.cell.chat.start',
         icon: Codicon.sparkle,
         title: ( localizeWithPath(
             'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
@@ -477,7 +488,7 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
         tooltip: ( localizeWithPath(
             'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
             'notebookActions.menu.insertCode.tooltip',
-            "Generate Code Cell with Chat"
+            "Start Chat to Generate Code"
         ))
     },
     order: -10,
@@ -563,3 +574,79 @@ registerAction2(class extends NotebookAction {
         NotebookChatController.get(context.notebookEditor)?.focusAbove();
     }
 });
+registerAction2(class extends NotebookAction {
+    constructor() {
+        super({
+            id: 'notebook.cell.chat.previousFromHistory',
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
+                'notebook.cell.chat.previousFromHistory',
+                "Previous From History"
+            )),
+            precondition: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
+            keybinding: {
+                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
+                weight: 0  + 10,
+                primary: 16 ,
+            }
+        });
+    }
+    async runWithContext(accessor, context) {
+        NotebookChatController.get(context.notebookEditor)?.populateHistory(true);
+    }
+});
+registerAction2(class extends NotebookAction {
+    constructor() {
+        super({
+            id: 'notebook.cell.chat.nextFromHistory',
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
+                'notebook.cell.chat.nextFromHistory',
+                "Next From History"
+            )),
+            precondition: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
+            keybinding: {
+                when: ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)),
+                weight: 0  + 10,
+                primary: 18
+            }
+        });
+    }
+    async runWithContext(accessor, context) {
+        NotebookChatController.get(context.notebookEditor)?.populateHistory(false);
+    }
+});
+registerAction2(class extends NotebookCellAction {
+    constructor() {
+        super({
+            id: 'notebook.cell.chat.restore',
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions',
+                'notebookActions.restoreCellprompt',
+                "Generate"
+            )),
+            icon: Codicon.sparkle,
+            menu: {
+                id: MenuId.NotebookCellTitle,
+                group: CELL_TITLE_CELL_GROUP_ID,
+                order: 0,
+                when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_INLINE_CHAT_HAS_PROVIDER, NOTEBOOK_CELL_GENERATED_BY_CHAT, ( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))))
+            }
+        });
+    }
+    async runWithContext(accessor, context) {
+        const cell = context.cell;
+        if (!cell) {
+            return;
+        }
+        const notebookEditor = context.notebookEditor;
+        const controller = NotebookChatController.get(notebookEditor);
+        if (!controller) {
+            return;
+        }
+        const prompt = controller.getPromptFromCache(cell);
+        if (prompt) {
+            controller.restore(cell, prompt);
+        }
+    }
+});

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

@@ -10,6 +10,8 @@ import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/d
 import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { CTX_INLINE_CHAT_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { insertCell } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
+import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
+import { NotebookChatController } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
 import { NotebookAction, executeNotebookCondition, getContextFromUri, getContextFromActiveEditor, NotebookMultiCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, cellExecutionArgs, parseMultiCellExecutionArgs, CELL_TITLE_CELL_GROUP_ID, NotebookCellAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { EXECUTE_CELL_COMMAND_ID, ScrollToRevealBehavior, CellEditState, CellFocusMode } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { executeAllIcon, executeIcon, executeAboveIcon, executeBelowIcon, stopIcon, executingStateIcon, errorStateIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
@@ -165,7 +167,7 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
                 "Execute Cell"
             )),
             keybinding: {
-                when: NOTEBOOK_CELL_LIST_FOCUSED,
+                when: ( ContextKeyExpr.or(NOTEBOOK_CELL_LIST_FOCUSED, ( ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED)))),
                 primary: 256  | 3 ,
                 win: {
                     primary: 2048  | 512  | 3
@@ -196,6 +198,18 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
         if (context.ui) {
             await context.notebookEditor.focusNotebookCell(context.cell, 'container', { skipReveal: true });
         }
+        const chatController = NotebookChatController.get(context.notebookEditor);
+        const editingCell = chatController?.getEditingCell();
+        if (chatController?.hasFocus() && editingCell) {
+            const group = editorGroupsService.activeGroup;
+            if (group) {
+                if (group.activeEditor) {
+                    group.pinEditor(group.activeEditor);
+                }
+            }
+            await context.notebookEditor.executeNotebookCells([editingCell]);
+            return;
+        }
         await runCell(editorGroupsService, context);
     }
 });

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

@@ -8,7 +8,7 @@ import { insertCell } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/
 import { NotebookAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_EDITABLE } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { CellKind, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from './chat/notebookChatContext.js';
+import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
 
 const INSERT_CODE_CELL_ABOVE_COMMAND_ID = 'notebook.cell.insertCodeCellAbove';
 const INSERT_CODE_CELL_BELOW_COMMAND_ID = 'notebook.cell.insertCodeCellBelow';

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

@@ -1,8 +1,10 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { NOTEBOOK_ACTIONS_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
@@ -265,3 +267,49 @@ registerAction2(class NotebookWebviewResetAction extends Action2 {
         }
     }
 });
+registerAction2(class ToggleNotebookStickyScroll extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.action.toggleNotebookStickyScroll',
+            title: {
+                ...( localize2WithPath(
+                    'vs/workbench/contrib/notebook/browser/controller/layoutActions',
+                    'toggleStickyScroll',
+                    "Toggle Notebook Sticky Scroll"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/contrib/notebook/browser/controller/layoutActions',
+                    { key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] },
+                    "&&Toggle Notebook Sticky Scroll"
+                )),
+            },
+            category: Categories.View,
+            toggled: {
+                condition: ( ContextKeyExpr.equals('config.notebook.stickyScroll.enabled', true)),
+                title: ( localizeWithPath(
+                    'vs/workbench/contrib/notebook/browser/controller/layoutActions',
+                    'notebookStickyScroll',
+                    "Toggle Notebook Sticky Scroll"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/contrib/notebook/browser/controller/layoutActions',
+                    { key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] },
+                    "&&Toggle Notebook Sticky Scroll"
+                )),
+            },
+            menu: [
+                { id: MenuId.CommandPalette },
+                {
+                    id: MenuId.NotebookStickyScrollContext,
+                    group: 'notebookView',
+                    order: 2
+                }
+            ]
+        });
+    }
+    async run(accessor) {
+        const configurationService = accessor.get(IConfigurationService);
+        const newValue = !configurationService.getValue('notebook.stickyScroll.enabled');
+        return configurationService.updateValue('notebook.stickyScroll.enabled', newValue);
+    }
+});

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

@@ -0,0 +1,199 @@
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { NotebookOutlineContext } from '../contrib/outline/notebookOutline.js';
+import { FoldingController } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/foldingController';
+import { executeIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+
+class NotebookRunSingleCellInSection extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.section.runSingleCell',
+            title: {
+                ...( localize2WithPath(
+                    'vs/workbench/contrib/notebook/browser/controller/sectionActions',
+                    'runCell',
+                    "Run Cell"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/contrib/notebook/browser/controller/sectionActions',
+                    { key: 'mirunCell', comment: ['&& denotes a mnemonic'] },
+                    "&&Run Cell"
+                )),
+            },
+            shortTitle: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/sectionActions',
+                'runCell',
+                "Run Cell"
+            )),
+            icon: executeIcon,
+            menu: [
+                {
+                    id: MenuId.NotebookOutlineActionMenu,
+                    group: 'inline',
+                    order: 1,
+                    when: ( ContextKeyExpr.and(( NotebookOutlineContext.CellKind.isEqualTo(CellKind.Code)), ( NotebookOutlineContext.OutlineElementTarget.isEqualTo(1 )), ( NotebookOutlineContext.CellHasChildren.toNegated()), ( NotebookOutlineContext.CellHasHeader.toNegated())))
+                }
+            ]
+        });
+    }
+    async run(_accessor, context) {
+        if (!checkSectionContext(context)) {
+            return;
+        }
+        context.notebookEditor.executeNotebookCells([context.outlineEntry.cell]);
+    }
+}
+class NotebookRunCellsInSection extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.section.runCells',
+            title: {
+                ...( localize2WithPath(
+                    'vs/workbench/contrib/notebook/browser/controller/sectionActions',
+                    'runCellsInSection',
+                    "Run Cells In Section"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/contrib/notebook/browser/controller/sectionActions',
+                    { key: 'mirunCellsInSection', comment: ['&& denotes a mnemonic'] },
+                    "&&Run Cells In Section"
+                )),
+            },
+            shortTitle: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/sectionActions',
+                'runCellsInSection',
+                "Run Cells In Section"
+            )),
+            menu: [
+                {
+                    id: MenuId.NotebookStickyScrollContext,
+                    group: 'notebookExecution',
+                    order: 1
+                },
+                {
+                    id: MenuId.NotebookOutlineActionMenu,
+                    group: 'inline',
+                    order: 1,
+                    when: ( ContextKeyExpr.and(( NotebookOutlineContext.CellKind.isEqualTo(CellKind.Markup)), ( NotebookOutlineContext.OutlineElementTarget.isEqualTo(1 )), NotebookOutlineContext.CellHasChildren, NotebookOutlineContext.CellHasHeader))
+                }
+            ]
+        });
+    }
+    async run(_accessor, context) {
+        if (!checkSectionContext(context)) {
+            return;
+        }
+        const cell = context.outlineEntry.cell;
+        const idx = context.notebookEditor.getViewModel()?.getCellIndex(cell);
+        if (idx === undefined) {
+            return;
+        }
+        const length = context.notebookEditor.getViewModel()?.getFoldedLength(idx);
+        if (length === undefined) {
+            return;
+        }
+        const cells = context.notebookEditor.getCellsInRange({ start: idx, end: idx + length + 1 });
+        context.notebookEditor.executeNotebookCells(cells);
+    }
+}
+class NotebookFoldSection extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.section.foldSection',
+            title: {
+                ...( localize2WithPath(
+                    'vs/workbench/contrib/notebook/browser/controller/sectionActions',
+                    'foldSection',
+                    "Fold Section"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/contrib/notebook/browser/controller/sectionActions',
+                    { key: 'mifoldSection', comment: ['&& denotes a mnemonic'] },
+                    "&&Fold Section"
+                )),
+            },
+            shortTitle: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/sectionActions',
+                'foldSection',
+                "Fold Section"
+            )),
+            menu: [
+                {
+                    id: MenuId.NotebookOutlineActionMenu,
+                    group: 'notebookFolding',
+                    order: 2,
+                    when: ( ContextKeyExpr.and(( NotebookOutlineContext.CellKind.isEqualTo(CellKind.Markup)), ( NotebookOutlineContext.OutlineElementTarget.isEqualTo(1 )), NotebookOutlineContext.CellHasChildren, NotebookOutlineContext.CellHasHeader, ( NotebookOutlineContext.CellFoldingState.isEqualTo(1 ))))
+                }
+            ]
+        });
+    }
+    async run(_accessor, context) {
+        if (!checkSectionContext(context)) {
+            return;
+        }
+        this.toggleFoldRange(context.outlineEntry, context.notebookEditor);
+    }
+    toggleFoldRange(entry, notebookEditor) {
+        const foldingController = notebookEditor.getContribution(FoldingController.id);
+        const index = entry.index;
+        const headerLevel = entry.level;
+        const newFoldingState = 2 ;
+        foldingController.setFoldingStateDown(index, newFoldingState, headerLevel);
+    }
+}
+class NotebookExpandSection extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.section.expandSection',
+            title: {
+                ...( localize2WithPath(
+                    'vs/workbench/contrib/notebook/browser/controller/sectionActions',
+                    'expandSection',
+                    "Expand Section"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/contrib/notebook/browser/controller/sectionActions',
+                    { key: 'miexpandSection', comment: ['&& denotes a mnemonic'] },
+                    "&&Expand Section"
+                )),
+            },
+            shortTitle: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/controller/sectionActions',
+                'expandSection',
+                "Expand Section"
+            )),
+            menu: [
+                {
+                    id: MenuId.NotebookOutlineActionMenu,
+                    group: 'notebookFolding',
+                    order: 2,
+                    when: ( ContextKeyExpr.and(( NotebookOutlineContext.CellKind.isEqualTo(CellKind.Markup)), ( NotebookOutlineContext.OutlineElementTarget.isEqualTo(1 )), NotebookOutlineContext.CellHasChildren, NotebookOutlineContext.CellHasHeader, ( NotebookOutlineContext.CellFoldingState.isEqualTo(2 ))))
+                }
+            ]
+        });
+    }
+    async run(_accessor, context) {
+        if (!checkSectionContext(context)) {
+            return;
+        }
+        this.toggleFoldRange(context.outlineEntry, context.notebookEditor);
+    }
+    toggleFoldRange(entry, notebookEditor) {
+        const foldingController = notebookEditor.getContribution(FoldingController.id);
+        const index = entry.index;
+        const headerLevel = entry.level;
+        const newFoldingState = 1 ;
+        foldingController.setFoldingStateDown(index, newFoldingState, headerLevel);
+    }
+}
+function checkSectionContext(context) {
+    return !!(context && context.notebookEditor && context.outlineEntry);
+}
+registerAction2(NotebookRunSingleCellInSection);
+registerAction2(NotebookRunCellsInSection);
+registerAction2(NotebookFoldSection);
+registerAction2(NotebookExpandSection);
+
+export { NotebookExpandSection, NotebookFoldSection, NotebookRunCellsInSection, NotebookRunSingleCellInSection };

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.js

@@ -40,6 +40,8 @@ const fixedDiffEditorOptions = {
     wordWrap: 'off',
     diffWordWrap: 'off',
     diffAlgorithm: 'advanced',
+    renderSideBySide: true,
+    useInlineViewWhenSpaceIsLimited: false
 };
 
 export { fixedDiffEditorOptions, fixedEditorOptions, fixedEditorPadding };

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.js

@@ -1,16 +1,16 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { scheduleAtNextAnimationFrame, getWindow, append, $, reset } from 'vscode/vscode/vs/base/browser/dom';
+import { append, $, reset, scheduleAtNextAnimationFrame, getWindow } from 'vscode/vscode/vs/base/browser/dom';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { outputEqual, OUTPUT_EDITOR_HEIGHT_MAGIC, PropertyFoldingState, SideBySideDiffElementViewModel, getFormattedMetadataJSON, getFormattedOutputJSON } from './diffElementViewModel.js';
-import { DIFF_CELL_MARGIN, DiffSide, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED } from './notebookDiffEditorBrowser.js';
-import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditorWidget';
+import { PropertyFoldingState, outputEqual, OUTPUT_EDITOR_HEIGHT_MAGIC, SideBySideDiffElementViewModel, getFormattedMetadataJSON, getFormattedOutputJSON } from './diffElementViewModel.js';
+import { NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED, DIFF_CELL_MARGIN, DiffSide, NOTEBOOK_DIFF_CELL_INPUT } from './notebookDiffEditorBrowser.js';
+import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
-import { MenuId, MenuItemAction, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { MenuItemAction, IMenuService, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
@@ -87,11 +87,11 @@ let PropertyHeader = class PropertyHeader extends Disposable {
         }
         const cellToolbarContainer = append(this.propertyHeaderContainer, $('div.property-toolbar'));
         this._toolbar = ( new WorkbenchToolBar(cellToolbarContainer, {
-            actionViewItemProvider: action => {
+            actionViewItemProvider: (action, options) => {
                 if (action instanceof MenuItemAction) {
                     const item = ( new CodiconActionViewItem(
                         action,
-                        undefined,
+                        { hoverDelegate: options.hoverDelegate },
                         this.keybindingService,
                         this.notificationService,
                         this.contextKeyService,

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel.js

@@ -39,6 +39,12 @@ let DiffNestedCellViewModel = class DiffNestedCellViewModel extends Disposable {
         this._focusOnOutput = v;
         this._onDidChangeState.fire({ outputIsFocusedChanged: true });
     }
+    get inputInOutputIsFocused() {
+        return this._focusInputInOutput;
+    }
+    set inputInOutputIsFocused(v) {
+        this._focusInputInOutput = v;
+    }
     get outputsViewModels() {
         return this._outputViewModels;
     }
@@ -49,6 +55,7 @@ let DiffNestedCellViewModel = class DiffNestedCellViewModel extends Disposable {
         this._onDidChangeState = this._register(( new Emitter()));
         this._hoveringOutput = false;
         this._focusOnOutput = false;
+        this._focusInputInOutput = false;
         this._outputCollection = [];
         this._outputsTop = null;
         this._onDidChangeOutputLayout = this._register(( new Emitter()));