@codingame/monaco-vscode-notebook-service-override 5.2.0 → 6.0.0

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

@@ -1,5 +1,5 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeyCode, KeyMod, 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';
@@ -8,8 +8,9 @@ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/comma
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 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 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_RESPONSE_TYPES, InlineChatResponseTypes, CTX_INLINE_CHAT_HAS_AGENT } 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 } 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 { insertNewCell } from '../insertCellActions.js';
@@ -30,8 +31,8 @@ registerAction2(class extends NotebookAction {
                     CTX_INLINE_CHAT_FOCUSED,
                      (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
                 ))),
-                weight: 200 ,
-                primary: 3
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyCode.Enter
             },
             menu: {
                 id: MENU_CELL_CHAT_INPUT,
@@ -59,8 +60,8 @@ registerAction2(class extends NotebookCellAction {
                      (NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
                      (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
                 ))),
-                weight: 0  + 7,
-                primary: 2048  | 16
+                weight: KeybindingWeight.EditorCore + 7,
+                primary: KeyMod.CtrlCmd | KeyCode.UpArrow
             },
             f1: false
         });
@@ -94,8 +95,8 @@ registerAction2(class extends NotebookAction {
                      (NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
                      (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
                 ))),
-                weight: 0  + 7,
-                primary: 2048  | 18
+                weight: KeybindingWeight.EditorCore + 7,
+                primary: KeyMod.CtrlCmd | KeyCode.DownArrow
             },
             f1: false
         });
@@ -121,8 +122,8 @@ registerAction2(class extends NotebookCellAction {
                     )),
                      (EditorContextKeys.isEmbeddedDiffEditor.negate())
                 ))),
-                weight: 0  + 7,
-                primary: 2048  | 16
+                weight: KeybindingWeight.EditorCore + 7,
+                primary: KeyMod.CtrlCmd | KeyCode.UpArrow
             },
             f1: false
         });
@@ -149,8 +150,8 @@ registerAction2(class extends NotebookCellAction {
                     )),
                      (EditorContextKeys.isEmbeddedDiffEditor.negate())
                 ))),
-                weight: 0  + 7,
-                primary: 2048  | 18
+                weight: KeybindingWeight.EditorCore + 7,
+                primary: KeyMod.CtrlCmd | KeyCode.DownArrow
             },
             f1: false
         });
@@ -212,8 +213,8 @@ registerAction2(class extends NotebookAction {
                         CTX_INLINE_CHAT_FOCUSED,
                          (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
                     ))),
-                    weight: 100  + 10,
-                    primary: 2048  | 3 ,
+                    weight: KeybindingWeight.EditorContrib + 10,
+                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
                 },
                 {
                     when: ( (ContextKeyExpr.and(
@@ -222,8 +223,8 @@ registerAction2(class extends NotebookAction {
                         CTX_NOTEBOOK_CHAT_USER_DID_EDIT,
                          (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
                     ))),
-                    weight: 0  + 10,
-                    primary: 9
+                    weight: KeybindingWeight.EditorCore + 10,
+                    primary: KeyCode.Escape
                 },
                 {
                     when: ( (ContextKeyExpr.and(
@@ -232,8 +233,8 @@ registerAction2(class extends NotebookAction {
                          (NOTEBOOK_CELL_EDITOR_FOCUSED.negate()),
                          (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
                     ))),
-                    primary: 2048  | 3 ,
-                    weight: 200
+                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
+                    weight: KeybindingWeight.WorkbenchContrib
                 }
             ],
             menu: [
@@ -241,7 +242,7 @@ registerAction2(class extends NotebookAction {
                     id: MENU_CELL_CHAT_WIDGET_STATUS,
                     group: 'inline',
                     order: 0,
-                    when: ( (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" ))),
+                    when: ( (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo(InlineChatResponseTypes.OnlyMessages))),
                 }
             ],
             f1: false
@@ -264,8 +265,8 @@ registerAction2(class extends NotebookAction {
                      (CTX_NOTEBOOK_CHAT_USER_DID_EDIT.negate()),
                      (NOTEBOOK_CELL_EDITOR_FOCUSED.negate())
                 ))),
-                weight: 100 ,
-                primary: 9
+                weight: KeybindingWeight.EditorContrib,
+                primary: KeyCode.Escape
             },
             menu: {
                 id: MENU_CELL_CHAT_WIDGET_STATUS,
@@ -279,63 +280,6 @@ registerAction2(class extends NotebookAction {
         NotebookChatController.get(context.notebookEditor)?.discard();
     }
 });
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.feedbackHelpful',
-            title: ( localizeWithPath(_moduleId, 11, 'Helpful')),
-            icon: Codicon.thumbsup,
-            menu: {
-                id: MENU_CELL_CHAT_WIDGET_FEEDBACK,
-                group: 'inline',
-                order: 1,
-                when: ( (CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined))),
-            },
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.feedbackLast(1 );
-    }
-});
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.feedbackUnhelpful',
-            title: ( localizeWithPath(_moduleId, 12, 'Unhelpful')),
-            icon: Codicon.thumbsdown,
-            menu: {
-                id: MENU_CELL_CHAT_WIDGET_FEEDBACK,
-                group: 'inline',
-                order: 2,
-                when: ( (CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined))),
-            },
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.feedbackLast(0 );
-    }
-});
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.reportIssueForBug',
-            title: ( localizeWithPath(_moduleId, 13, 'Report Issue')),
-            icon: Codicon.report,
-            menu: {
-                id: MENU_CELL_CHAT_WIDGET_FEEDBACK,
-                group: 'inline',
-                order: 3,
-                when: ( (CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined))),
-            },
-            f1: false
-        });
-    }
-    async runWithContext(accessor, context) {
-        NotebookChatController.get(context.notebookEditor)?.feedbackLast(4 );
-    }
-});
 async function startChat(accessor, context, index, input, autoSend, source) {
     const configurationService = accessor.get(IConfigurationService);
     const commandService = accessor.get(ICommandService);
@@ -362,12 +306,12 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.start',
             title: {
-                value: '$(sparkle) ' + ( localizeWithPath(_moduleId, 14, "Generate")),
+                value: '$(sparkle) ' + ( localizeWithPath(_moduleId, 11, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localizeWithPath(_moduleId, 15, "Start Chat to Generate Code")),
+            tooltip: ( localizeWithPath(_moduleId, 12, "Start Chat to Generate Code")),
             metadata: {
-                description: ( localizeWithPath(_moduleId, 15, "Start Chat to Generate Code")),
+                description: ( localizeWithPath(_moduleId, 12, "Start Chat to Generate Code")),
                 args: [
                     {
                         name: 'args',
@@ -395,15 +339,15 @@ registerAction2(class extends NotebookAction {
                     NOTEBOOK_EDITOR_FOCUSED,
                      (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
                     ContextKeyExpr.not(InputFocusedContextKey),
-                    CTX_INLINE_CHAT_HAS_PROVIDER,
+                    CTX_INLINE_CHAT_HAS_AGENT,
                      (ContextKeyExpr.or(
                          (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
                          (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
                     ))
                 ))),
-                weight: 200 ,
-                primary: 2048  | 39 ,
-                secondary: [KeyChord(2048  | 41 , 39 )],
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyI,
+                secondary: [KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyI)],
             },
             menu: [
                 {
@@ -412,7 +356,7 @@ registerAction2(class extends NotebookAction {
                     order: -1,
                     when: ( (ContextKeyExpr.and(
                          (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
-                        CTX_INLINE_CHAT_HAS_PROVIDER,
+                        CTX_INLINE_CHAT_HAS_AGENT,
                          (ContextKeyExpr.or(
                              (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
                              (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
@@ -465,10 +409,10 @@ registerAction2(class extends NotebookAction {
         super({
             id: 'notebook.cell.chat.startAtTop',
             title: {
-                value: '$(sparkle) ' + ( localizeWithPath(_moduleId, 14, "Generate")),
+                value: '$(sparkle) ' + ( localizeWithPath(_moduleId, 11, "Generate")),
                 original: '$(sparkle) Generate',
             },
-            tooltip: ( localizeWithPath(_moduleId, 15, "Start Chat to Generate Code")),
+            tooltip: ( localizeWithPath(_moduleId, 12, "Start Chat to Generate Code")),
             f1: false,
             menu: [
                 {
@@ -477,7 +421,7 @@ registerAction2(class extends NotebookAction {
                     order: -1,
                     when: ( (ContextKeyExpr.and(
                          (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
-                        CTX_INLINE_CHAT_HAS_PROVIDER,
+                        CTX_INLINE_CHAT_HAS_AGENT,
                          (ContextKeyExpr.or(
                              (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
                              (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
@@ -495,8 +439,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: 'notebook.cell.chat.start',
         icon: Codicon.sparkle,
-        title: ( localizeWithPath(_moduleId, 16, "Generate")),
-        tooltip: ( localizeWithPath(_moduleId, 17, "Start Chat to Generate Code"))
+        title: ( localizeWithPath(_moduleId, 13, "Generate")),
+        tooltip: ( localizeWithPath(_moduleId, 14, "Start Chat to Generate Code"))
     },
     order: -10,
     group: 'navigation/add',
@@ -504,7 +448,7 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
          (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
          (ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'betweenCells')),
          (ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'hidden')),
-        CTX_INLINE_CHAT_HAS_PROVIDER,
+        CTX_INLINE_CHAT_HAS_AGENT,
          (ContextKeyExpr.or(
              (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
              (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
@@ -515,7 +459,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focus',
-            title: ( localizeWithPath(_moduleId, 18, 'Focus Chat')),
+            title: ( localizeWithPath(_moduleId, 15, 'Focus Chat')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -523,8 +467,8 @@ registerAction2(class extends NotebookAction {
                         ContextKeyExpr.not(InputFocusedContextKey),
                          (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('above'))
                     ))),
-                    primary: 2048  | 18 ,
-                    weight: 200
+                    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+                    weight: KeybindingWeight.WorkbenchContrib
                 },
                 {
                     when: ( (ContextKeyExpr.and(
@@ -532,8 +476,8 @@ registerAction2(class extends NotebookAction {
                         ContextKeyExpr.not(InputFocusedContextKey),
                          (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo('below'))
                     ))),
-                    primary: 2048  | 16 ,
-                    weight: 200
+                    primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
+                    weight: KeybindingWeight.WorkbenchContrib
                 }
             ],
             f1: false
@@ -547,12 +491,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusNextCell',
-            title: ( localizeWithPath(_moduleId, 19, 'Focus Next Cell')),
+            title: ( localizeWithPath(_moduleId, 16, 'Focus Next Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
-                    primary: 2048  | 18 ,
-                    weight: 200
+                    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+                    weight: KeybindingWeight.WorkbenchContrib
                 }
             ],
             f1: false
@@ -566,12 +510,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.focusPreviousCell',
-            title: ( localizeWithPath(_moduleId, 20, 'Focus Previous Cell')),
+            title: ( localizeWithPath(_moduleId, 17, 'Focus Previous Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
-                    primary: 2048  | 16 ,
-                    weight: 200
+                    primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
+                    weight: KeybindingWeight.WorkbenchContrib
                 }
             ],
             f1: false
@@ -585,12 +529,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.previousFromHistory',
-            title: ( localize2WithPath(_moduleId, 21, "Previous From History")),
+            title: ( localize2WithPath(_moduleId, 18, "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 ,
+                weight: KeybindingWeight.EditorCore + 10,
+                primary: KeyCode.UpArrow,
             },
             f1: false
         });
@@ -603,12 +547,12 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.nextFromHistory',
-            title: ( localize2WithPath(_moduleId, 22, "Next From History")),
+            title: ( localize2WithPath(_moduleId, 19, "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
+                weight: KeybindingWeight.EditorCore + 10,
+                primary: KeyCode.DownArrow
             },
             f1: false
         });
@@ -621,7 +565,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.chat.restore',
-            title: ( localize2WithPath(_moduleId, 23, "Generate")),
+            title: ( localize2WithPath(_moduleId, 20, "Generate")),
             icon: Codicon.sparkle,
             menu: {
                 id: MenuId.NotebookCellTitle,
@@ -629,7 +573,7 @@ registerAction2(class extends NotebookCellAction {
                 order: 0,
                 when: ( (ContextKeyExpr.and(
                      (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
-                    CTX_INLINE_CHAT_HAS_PROVIDER,
+                    CTX_INLINE_CHAT_HAS_AGENT,
                     NOTEBOOK_CELL_GENERATED_BY_CHAT,
                      (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))
                 )))

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

@@ -0,0 +1,31 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
+import './cellChatActions.js';
+import { NotebookChatController } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
+import { INotebookEditorService } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
+
+let NotebookChatVariables = class NotebookChatVariables extends Disposable {
+    static { this.ID = 'workbench.contrib.notebookChatVariables'; }
+    constructor(_chatVariableService, _notebookEditorService) {
+        super();
+        this._chatVariableService = _chatVariableService;
+        this._notebookEditorService = _notebookEditorService;
+        this._register(this._chatVariableService.registerVariable({ id: '_notebookChatInput', name: '_notebookChatInput', description: '', hidden: true }, async (_message, _arg, model) => {
+            const editors = this._notebookEditorService.listNotebookEditors();
+            for (const editor of editors) {
+                const chatController = editor.getContribution(NotebookChatController.id);
+                if (chatController?.hasSession(model)) {
+                    return chatController.getSessionInputUri();
+                }
+            }
+            return undefined;
+        }));
+    }
+};
+NotebookChatVariables = ( __decorate([
+    ( __param(0, IChatVariablesService)),
+    ( __param(1, INotebookEditorService))
+], NotebookChatVariables));
+registerWorkbenchContribution2(NotebookChatVariables.ID, NotebookChatVariables, WorkbenchPhase.BlockRestore);

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

@@ -1,4 +1,5 @@
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
@@ -6,13 +7,13 @@ import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { EditorsOrder } from 'vscode/vscode/vs/workbench/common/editor';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
-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 { NotebookAction, executeNotebookCondition, getContextFromUri, getContextFromActiveEditor, NotebookMultiCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, cellExecutionArgs, parseMultiCellExecutionArgs, CellToolbarOrder, CELL_TITLE_CELL_GROUP_ID, NotebookCellAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { CellEditState, EXECUTE_CELL_COMMAND_ID, ScrollToRevealBehavior, 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';
 import { CellKind, NotebookSetting, CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
@@ -85,11 +86,6 @@ async function runCell(editorGroupsService, context) {
     if (!foundEditor) {
         return;
     }
-    const controller = InlineChatController.get(foundEditor);
-    if (!controller) {
-        return;
-    }
-    controller.createSnapshot();
 }
 registerAction2(class RenderAllMarkdownCellsAction extends NotebookAction {
     constructor() {
@@ -153,7 +149,7 @@ registerAction2(class ExecuteNotebookAction extends NotebookAction {
     async runWithContext(accessor, context) {
         renderAllMarkdownCells(context);
         const editorService = accessor.get(IEditorService);
-        const editor = editorService.getEditors(0 ).find(editor => editor.editor instanceof NotebookEditorInput && editor.editor.viewType === context.notebookEditor.textModel.viewType && ( (editor.editor.resource.toString())) === ( (context.notebookEditor.textModel.uri.toString())));
+        const editor = editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).find(editor => editor.editor instanceof NotebookEditorInput && editor.editor.viewType === context.notebookEditor.textModel.viewType && ( (editor.editor.resource.toString())) === ( (context.notebookEditor.textModel.uri.toString())));
         const editorGroupService = accessor.get(IEditorGroupsService);
         if (editor) {
             const group = editorGroupService.getGroup(editor.groupId);
@@ -173,9 +169,9 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
                     NOTEBOOK_CELL_LIST_FOCUSED,
                      (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))
                 ))),
-                primary: 256  | 3 ,
+                primary: KeyMod.WinCtrl | KeyCode.Enter,
                 win: {
-                    primary: 2048  | 512  | 3
+                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Enter
                 },
                 weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
             },
@@ -230,7 +226,7 @@ registerAction2(class ExecuteAboveCells extends NotebookMultiCellAction {
                 },
                 {
                     id: MenuId.NotebookCellTitle,
-                    order: 1 ,
+                    order: CellToolbarOrder.ExecuteAboveCells,
                     group: CELL_TITLE_CELL_GROUP_ID,
                     when: ( (ContextKeyExpr.and(
                         executeCondition,
@@ -276,7 +272,7 @@ registerAction2(class ExecuteCellAndBelow extends NotebookMultiCellAction {
                 },
                 {
                     id: MenuId.NotebookCellTitle,
-                    order: 2 ,
+                    order: CellToolbarOrder.ExecuteCellAndBelow,
                     group: CELL_TITLE_CELL_GROUP_ID,
                     when: ( (ContextKeyExpr.and(
                         executeCondition,
@@ -417,7 +413,7 @@ registerAction2(class ExecuteCellSelectBelow extends NotebookCellAction {
                     NOTEBOOK_CELL_LIST_FOCUSED,
                      (CTX_INLINE_CHAT_FOCUSED.negate())
                 ))),
-                primary: 1024  | 3 ,
+                primary: KeyMod.Shift | KeyCode.Enter,
                 weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
             },
         });
@@ -480,7 +476,7 @@ registerAction2(class ExecuteCellInsertBelow extends NotebookCellAction {
             title: ( localizeWithPath(_moduleId, 8, "Execute Notebook Cell and Insert Below")),
             keybinding: {
                 when: NOTEBOOK_CELL_LIST_FOCUSED,
-                primary: 512  | 3 ,
+                primary: KeyMod.Alt | KeyCode.Enter,
                 weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
             },
         });

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

@@ -1,9 +1,11 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { insertCell } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
 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';
@@ -56,12 +58,12 @@ registerAction2(class InsertCodeCellAboveAction extends InsertCellCommand {
             id: INSERT_CODE_CELL_ABOVE_COMMAND_ID,
             title: ( localizeWithPath(_moduleId, 0, "Insert Code Cell Above")),
             keybinding: {
-                primary: 2048  | 1024  | 3 ,
+                primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter,
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
                      (InputFocusedContext.toNegated())
                 ))),
-                weight: 200
+                weight: KeybindingWeight.WorkbenchContrib
             },
             menu: {
                 id: MenuId.NotebookCellInsert,
@@ -84,13 +86,13 @@ registerAction2(class InsertCodeCellBelowAction extends InsertCellCommand {
             id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
             title: ( localizeWithPath(_moduleId, 2, "Insert Code Cell Below")),
             keybinding: {
-                primary: 2048  | 3 ,
+                primary: KeyMod.CtrlCmd | KeyCode.Enter,
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
                      (InputFocusedContext.toNegated()),
                      (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
                 ))),
-                weight: 200
+                weight: KeybindingWeight.WorkbenchContrib
             },
             menu: {
                 id: MenuId.NotebookCellInsert,

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

@@ -4,6 +4,7 @@ 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.service';
+import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
@@ -179,8 +180,8 @@ registerAction2(class SaveMimeTypeDisplayOrder extends Action2 {
         const qp = accessor.get(IQuickInputService).createQuickPick();
         qp.placeholder = ( localizeWithPath(_moduleId, 8, 'Settings file to save in'));
         qp.items = [
-            { target: 2 , label: ( localizeWithPath(_moduleId, 9, 'User Settings')) },
-            { target: 5 , label: ( localizeWithPath(_moduleId, 10, 'Workspace Settings')) },
+            { target: ConfigurationTarget.USER, label: ( localizeWithPath(_moduleId, 9, 'User Settings')) },
+            { target: ConfigurationTarget.WORKSPACE, label: ( localizeWithPath(_moduleId, 10, 'Workspace Settings')) },
         ];
         qp.onDidAccept(() => {
             const target = qp.selectedItems[0]?.target;

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

@@ -3,8 +3,10 @@ import { Action2, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/acti
 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 { CellFoldingState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { executeIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { OutlineTarget } from 'vscode/vscode/vs/workbench/services/outline/browser/outline';
 
 const _moduleId = "vs/workbench/contrib/notebook/browser/controller/sectionActions";
 class NotebookRunSingleCellInSection extends Action2 {
@@ -24,7 +26,7 @@ class NotebookRunSingleCellInSection extends Action2 {
                     order: 1,
                     when: ( (ContextKeyExpr.and(
                          (NotebookOutlineContext.CellKind.isEqualTo(CellKind.Code)),
-                         (NotebookOutlineContext.OutlineElementTarget.isEqualTo(1 )),
+                         (NotebookOutlineContext.OutlineElementTarget.isEqualTo(OutlineTarget.OutlinePane)),
                          (NotebookOutlineContext.CellHasChildren.toNegated()),
                          (NotebookOutlineContext.CellHasHeader.toNegated())
                     )))
@@ -60,7 +62,7 @@ class NotebookRunCellsInSection extends Action2 {
                     order: 1,
                     when: ( (ContextKeyExpr.and(
                          (NotebookOutlineContext.CellKind.isEqualTo(CellKind.Markup)),
-                         (NotebookOutlineContext.OutlineElementTarget.isEqualTo(1 )),
+                         (NotebookOutlineContext.OutlineElementTarget.isEqualTo(OutlineTarget.OutlinePane)),
                         NotebookOutlineContext.CellHasChildren,
                         NotebookOutlineContext.CellHasHeader
                     )))
@@ -101,10 +103,10 @@ class NotebookFoldSection extends Action2 {
                     order: 2,
                     when: ( (ContextKeyExpr.and(
                          (NotebookOutlineContext.CellKind.isEqualTo(CellKind.Markup)),
-                         (NotebookOutlineContext.OutlineElementTarget.isEqualTo(1 )),
+                         (NotebookOutlineContext.OutlineElementTarget.isEqualTo(OutlineTarget.OutlinePane)),
                         NotebookOutlineContext.CellHasChildren,
                         NotebookOutlineContext.CellHasHeader,
-                         (NotebookOutlineContext.CellFoldingState.isEqualTo(1 ))
+                         (NotebookOutlineContext.CellFoldingState.isEqualTo(CellFoldingState.Expanded))
                     )))
                 }
             ]
@@ -120,7 +122,7 @@ class NotebookFoldSection extends Action2 {
         const foldingController = notebookEditor.getContribution(FoldingController.id);
         const index = entry.index;
         const headerLevel = entry.level;
-        const newFoldingState = 2 ;
+        const newFoldingState = CellFoldingState.Collapsed;
         foldingController.setFoldingStateDown(index, newFoldingState, headerLevel);
     }
 }
@@ -140,10 +142,10 @@ class NotebookExpandSection extends Action2 {
                     order: 2,
                     when: ( (ContextKeyExpr.and(
                          (NotebookOutlineContext.CellKind.isEqualTo(CellKind.Markup)),
-                         (NotebookOutlineContext.OutlineElementTarget.isEqualTo(1 )),
+                         (NotebookOutlineContext.OutlineElementTarget.isEqualTo(OutlineTarget.OutlinePane)),
                         NotebookOutlineContext.CellHasChildren,
                         NotebookOutlineContext.CellHasHeader,
-                         (NotebookOutlineContext.CellFoldingState.isEqualTo(2 ))
+                         (NotebookOutlineContext.CellFoldingState.isEqualTo(CellFoldingState.Collapsed))
                     )))
                 }
             ]
@@ -159,7 +161,7 @@ class NotebookExpandSection extends Action2 {
         const foldingController = notebookEditor.getContribution(FoldingController.id);
         const index = entry.index;
         const headerLevel = entry.level;
-        const newFoldingState = 1 ;
+        const newFoldingState = CellFoldingState.Expanded;
         foldingController.setFoldingStateDown(index, newFoldingState, headerLevel);
     }
 }