@codingame/monaco-vscode-interactive-service-override 11.1.1 → 12.0.0

package/index.d.ts

@@ -1 +1,2 @@
-export { default } from 'vscode/service-override/interactive';
+import type { IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+export default function getServiceOverride(): IEditorOverrideServices;

package/index.js

@@ -1 +1,16 @@
-export { default } from './interactive.js';
+
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { InteractiveHistoryService } from './vscode/src/vs/workbench/contrib/interactive/browser/interactiveHistoryService.js';
+import { IInteractiveHistoryService } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveHistoryService.service';
+import { InteractiveDocumentService } from './vscode/src/vs/workbench/contrib/interactive/browser/interactiveDocumentService.js';
+import { IInteractiveDocumentService } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveDocumentService.service';
+import './vscode/src/vs/workbench/contrib/interactive/browser/interactive.contribution.js';
+
+function getServiceOverride() {
+    return {
+        [IInteractiveHistoryService.toString()]: new SyncDescriptor(InteractiveHistoryService, [], true),
+        [IInteractiveDocumentService.toString()]: new SyncDescriptor(InteractiveDocumentService, [], true)
+    };
+}
+
+export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-interactive-service-override",
-  "version": "11.1.1",
+  "version": "12.0.0",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - interactive service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,27 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - interactive service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common": "12.0.0",
+    "@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common": "12.0.0",
+    "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common": "12.0.0",
+    "@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common": "12.0.0",
+    "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common": "12.0.0",
+    "@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common": "12.0.0",
+    "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common": "12.0.0",
+    "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common": "12.0.0",
+    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "12.0.0",
+    "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "12.0.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.0"
+  },
+  "peerDependencies": {
+    "@codingame/monaco-vscode-notebook-service-override": "12.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@codingame/monaco-vscode-notebook-service-override": {
+      "optional": true
+    }
+  },
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,12 +43,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.1",
-    "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "11.1.1",
-    "@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common": "11.1.1"
   }
 }

package/vscode/src/vs/workbench/contrib/interactive/browser/interactive.contribution.d.ts

@@ -0,0 +1,20 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IEditorSerializer } from "vscode/vscode/vs/workbench/common/editor";
+import { EditorInput } from "vscode/vscode/vs/workbench/common/editor/editorInput";
+import { InteractiveEditorInput } from "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput";
+import { INotebookService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
+import { IEditorResolverService } from "vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+export declare class InteractiveDocumentContribution extends Disposable implements IWorkbenchContribution {
+    private readonly instantiationService;
+    static readonly ID = "workbench.contrib.interactiveDocument";
+    constructor(notebookService: INotebookService, editorResolverService: IEditorResolverService, editorService: IEditorService, instantiationService: IInstantiationService);
+}
+export declare class InteractiveEditorSerializer implements IEditorSerializer {
+    static readonly ID: string;
+    canSerialize(editor: EditorInput): editor is InteractiveEditorInput;
+    serialize(input: EditorInput): string | undefined;
+    deserialize(instantiationService: IInstantiationService, raw: string): InteractiveEditorInput | undefined;
+}

package/vscode/src/vs/workbench/contrib/interactive/browser/interactive.contribution.js

@@ -1,5 +1,7 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { parse } from 'vscode/vscode/vs/base/common/marshalling';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
@@ -20,7 +22,9 @@ import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/confi
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { EditorActivation } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { registerColor, ifDefinedThenElse } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
@@ -34,26 +38,26 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
-import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
-import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/editor';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { EditorExtensions, EditorsOrder } from 'vscode/vscode/vs/workbench/common/editor';
 import { PANEL_BORDER } from 'vscode/vscode/vs/workbench/common/theme';
-import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { INTERACTIVE_INPUT_CURSOR_BOUNDARY, InteractiveWindowSetting } from './interactiveCommon.js';
+import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { INTERACTIVE_INPUT_CURSOR_BOUNDARY, ReplEditorSettings } from './interactiveCommon.js';
 import 'vscode/vscode/vs/base/common/event';
 import { InteractiveEditor } from './interactiveEditor.js';
-import { InteractiveEditorInput } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
+import { InteractiveEditorInput } from '@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
 import 'vscode/vscode/vs/base/common/collections';
 import 'vscode/vscode/vs/base/common/map';
 import { IInteractiveHistoryService } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveHistoryService.service';
-import { NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { executeIcon } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { executeIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { INotebookEditorService } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
-import { INTERACTIVE_WINDOW_EDITOR_ID, CellUri, NotebookWorkingCopyTypeIdentifier, CellKind, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { IS_COMPOSITE_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED, InteractiveWindowOpen } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { INTERACTIVE_WINDOW_EDITOR_ID, CellUri, NotebookWorkingCopyTypeIdentifier, CellEditType, CellKind, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { IS_COMPOSITE_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED, InteractiveWindowOpen } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
-import { columnToEditorGroup } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { columnToEditorGroup } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
@@ -61,12 +65,12 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service';
 import { isReplEditorControl } from '../../replNotebook/browser/replEditor.js';
-import { InlineChatController } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { IsWindowsContext, IsLinuxContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 
-const interactiveWindowCategory = ( localize2(1891, "Interactive Window"));
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(InteractiveEditor, INTERACTIVE_WINDOW_EDITOR_ID, 'Interactive Window'), [
-    ( (new SyncDescriptor(InteractiveEditorInput)))
+const interactiveWindowCategory = ( localize2(6824, "Interactive Window"));
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(InteractiveEditor, INTERACTIVE_WINDOW_EDITOR_ID, 'Interactive Window'), [
+    ( new SyncDescriptor(InteractiveEditorInput))
 ]);
 let InteractiveDocumentContribution = class InteractiveDocumentContribution extends Disposable {
     static { this.ID = 'workbench.contrib.interactiveDocument'; }
@@ -91,7 +95,7 @@ let InteractiveDocumentContribution = class InteractiveDocumentContribution exte
             singlePerResource: true
         }, {
             createEditorInput: ({ resource }) => {
-                const editorInput = editorService.getEditors(1 ).find(editor => editor.editor instanceof InteractiveEditorInput && ( (editor.editor.inputResource.toString())) === ( (resource.toString())));
+                const editorInput = editorService.getEditors(EditorsOrder.SEQUENTIAL).find(editor => editor.editor instanceof InteractiveEditorInput && ( editor.editor.inputResource.toString()) === ( resource.toString()));
                 return editorInput;
             }
         });
@@ -129,7 +133,7 @@ let InteractiveDocumentContribution = class InteractiveDocumentContribution exte
             },
             createUntitledEditorInput: ({ resource, options }) => {
                 if (!resource) {
-                    throw ( (new Error('Interactive window editors must have a resource name')));
+                    throw ( new Error('Interactive window editors must have a resource name'));
                 }
                 const data = CellUri.parse(resource);
                 let cellOptions;
@@ -154,12 +158,12 @@ let InteractiveDocumentContribution = class InteractiveDocumentContribution exte
         });
     }
 };
-InteractiveDocumentContribution = ( (__decorate([
-    ( (__param(0, INotebookService))),
-    ( (__param(1, IEditorResolverService))),
-    ( (__param(2, IEditorService))),
-    ( (__param(3, IInstantiationService)))
-], InteractiveDocumentContribution)));
+InteractiveDocumentContribution = ( __decorate([
+    ( __param(0, INotebookService)),
+    ( __param(1, IEditorResolverService)),
+    ( __param(2, IEditorService)),
+    ( __param(3, IInstantiationService))
+], InteractiveDocumentContribution));
 let InteractiveInputContentProvider = class InteractiveInputContentProvider {
     static { this.ID = 'workbench.contrib.interactiveInputContentProvider'; }
     constructor(textModelService, _modelService) {
@@ -178,14 +182,14 @@ let InteractiveInputContentProvider = class InteractiveInputContentProvider {
         return result;
     }
 };
-InteractiveInputContentProvider = ( (__decorate([
-    ( (__param(0, ITextModelService))),
-    ( (__param(1, IModelService)))
-], InteractiveInputContentProvider)));
+InteractiveInputContentProvider = ( __decorate([
+    ( __param(0, ITextModelService)),
+    ( __param(1, IModelService))
+], InteractiveInputContentProvider));
 function createEditor(resource, instantiationService) {
     const counter = /\/Interactive-(\d+)/.exec(resource.path);
     const inputBoxPath = counter && counter[1] ? `/InteractiveInput-${counter[1]}` : 'InteractiveInput';
-    const inputUri = ( (URI.from({ scheme: Schemas.vscodeInteractiveInput, path: inputBoxPath })));
+    const inputUri = ( URI.from({ scheme: Schemas.vscodeInteractiveInput, path: inputBoxPath }));
     const editorInput = InteractiveEditorInput.create(instantiationService, resource, inputUri);
     return editorInput;
 }
@@ -219,12 +223,12 @@ let InteractiveWindowWorkingCopyEditorHandler = class InteractiveWindowWorkingCo
         return NotebookWorkingCopyTypeIdentifier.parse(workingCopy.typeId)?.viewType;
     }
 };
-InteractiveWindowWorkingCopyEditorHandler = ( (__decorate([
-    ( (__param(0, IInstantiationService))),
-    ( (__param(1, IWorkingCopyEditorService))),
-    ( (__param(2, IExtensionService)))
-], InteractiveWindowWorkingCopyEditorHandler)));
-registerWorkbenchContribution2(InteractiveDocumentContribution.ID, InteractiveDocumentContribution, 2 );
+InteractiveWindowWorkingCopyEditorHandler = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IWorkingCopyEditorService)),
+    ( __param(2, IExtensionService))
+], InteractiveWindowWorkingCopyEditorHandler));
+registerWorkbenchContribution2(InteractiveDocumentContribution.ID, InteractiveDocumentContribution, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(InteractiveInputContentProvider.ID, InteractiveInputContentProvider, {
     editorTypeId: INTERACTIVE_WINDOW_EDITOR_ID
 });
@@ -263,17 +267,17 @@ class InteractiveEditorSerializer {
         return input;
     }
 }
-( (Registry.as(EditorExtensions.EditorFactory)))
+( Registry.as(EditorExtensions.EditorFactory))
     .registerEditorSerializer(InteractiveEditorSerializer.ID, InteractiveEditorSerializer);
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: '_interactive.open',
-            title: ( localize2(1892, 'Open Interactive Window')),
+            title: ( localize2(6825, 'Open Interactive Window')),
             f1: false,
             category: interactiveWindowCategory,
             metadata: {
-                description: ( localize(1892, 'Open Interactive Window')),
+                description: ( localize(6825, 'Open Interactive Window')),
                 args: [
                     {
                         name: 'showOptions',
@@ -324,11 +328,11 @@ registerAction2(class extends Action2 {
             preserveFocus: typeof showOptions !== 'number' ? (showOptions?.preserveFocus ?? false) : false
         };
         if (resource && extname(resource) === '.interactive') {
-            logService.debug('Open interactive window from resource:', ( (resource.toString())));
+            logService.debug('Open interactive window from resource:', ( resource.toString()));
             const resourceUri = URI.revive(resource);
-            const editors = editorService.findEditors(resourceUri).filter(id => id.editor instanceof InteractiveEditorInput && id.editor.resource?.toString() === ( (resourceUri.toString())));
+            const editors = editorService.findEditors(resourceUri).filter(id => id.editor instanceof InteractiveEditorInput && id.editor.resource?.toString() === ( resourceUri.toString()));
             if (editors.length) {
-                logService.debug('Find existing interactive window:', ( (resource.toString())));
+                logService.debug('Find existing interactive window:', ( resource.toString()));
                 const editorInput = editors[0].editor;
                 const currentGroup = editors[0].groupId;
                 const editor = await editorService.openEditor(editorInput, editorOptions, currentGroup);
@@ -340,24 +344,24 @@ registerAction2(class extends Action2 {
                 };
             }
         }
-        const existingNotebookDocument = ( (new Set()));
-        editorService.getEditors(1 ).forEach(editor => {
+        const existingNotebookDocument = ( new Set());
+        editorService.getEditors(EditorsOrder.SEQUENTIAL).forEach(editor => {
             if (editor.editor.resource) {
-                existingNotebookDocument.add(( (editor.editor.resource.toString())));
+                existingNotebookDocument.add(( editor.editor.resource.toString()));
             }
         });
         let notebookUri = undefined;
         let inputUri = undefined;
         let counter = 1;
         do {
-            notebookUri = ( (URI.from({ scheme: Schemas.untitled, path: `/Interactive-${counter}.interactive` })));
-            inputUri = ( (URI.from(
+            notebookUri = ( URI.from({ scheme: Schemas.untitled, path: `/Interactive-${counter}.interactive` }));
+            inputUri = ( URI.from(
                 { scheme: Schemas.vscodeInteractiveInput, path: `/InteractiveInput-${counter}` }
-            )));
+            ));
             counter++;
-        } while (( (existingNotebookDocument.has( (notebookUri.toString())))));
+        } while (( existingNotebookDocument.has(( notebookUri.toString()))));
         InteractiveEditorInput.setName(notebookUri, title);
-        logService.debug('Open new interactive window:', ( (notebookUri.toString())), ( (inputUri.toString())));
+        logService.debug('Open new interactive window:', ( notebookUri.toString()), ( inputUri.toString()));
         if (id) {
             const allKernels = kernelService.getMatchingKernel({ uri: notebookUri, notebookType: 'interactive' }).all;
             const preferredKernel = allKernels.find(kernel => kernel.id === id);
@@ -377,25 +381,19 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.execute',
-            title: ( localize2(1893, 'Execute Code')),
+            title: ( localize2(6826, 'Execute Code')),
             category: interactiveWindowCategory,
             keybinding: [{
-                    when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
-                    primary: 2048  | 3 ,
+                    when: ( ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, ( ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')))),
+                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }, {
-                    when: ( (ContextKeyExpr.and(
-                         (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')),
-                         (ContextKeyExpr.equals('config.interactiveWindow.executeWithShiftEnter', true))
-                    ))),
-                    primary: 1024  | 3 ,
+                    when: ( ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, ( ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')), ( ContextKeyExpr.equals('config.interactiveWindow.executeWithShiftEnter', true)))),
+                    primary: KeyMod.Shift | KeyCode.Enter,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }, {
-                    when: ( (ContextKeyExpr.and(
-                         (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')),
-                         (ContextKeyExpr.equals('config.interactiveWindow.executeWithShiftEnter', false))
-                    ))),
-                    primary: 3 ,
+                    when: ( ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, ( ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')), ( ContextKeyExpr.equals('config.interactiveWindow.executeWithShiftEnter', false)))),
+                    primary: KeyCode.Enter,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }],
             menu: [
@@ -462,8 +460,8 @@ registerAction2(class extends Action2 {
                     } :
                     undefined;
                 await bulkEditService.apply([
-                    ( (new ResourceNotebookCellEdit(notebookDocument.uri, {
-                        editType: 1 ,
+                    ( new ResourceNotebookCellEdit(notebookDocument.uri, {
+                        editType: CellEditType.Replace,
                         index: index,
                         count: 0,
                         cells: [{
@@ -475,7 +473,7 @@ registerAction2(class extends Action2 {
                                 metadata: {},
                                 collapseState
                             }]
-                    })))
+                    }))
                 ]);
                 const range = { start: index, end: index + 1 };
                 editorControl.notebookEditor.revealCellRangeInView(range);
@@ -493,7 +491,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.input.clear',
-            title: ( localize2(1894, 'Clear the interactive window input editor contents')),
+            title: ( localize2(6827, 'Clear the interactive window input editor contents')),
             category: interactiveWindowCategory,
             f1: false
         });
@@ -515,19 +513,15 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.history.previous',
-            title: ( localize2(1895, 'Previous value in history')),
+            title: ( localize2(6828, 'Previous value in history')),
             category: interactiveWindowCategory,
             f1: false,
             keybinding: {
-                when: ( (ContextKeyExpr.and(
-                     (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('bottom')),
-                     (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')),
-                     (Context.Visible.toNegated())
-                ))),
-                primary: 16 ,
-                weight: 200
+                when: ( ContextKeyExpr.and(( INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('bottom')), ( INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')), ( Context.Visible.toNegated()))),
+                primary: KeyCode.UpArrow,
+                weight: KeybindingWeight.WorkbenchContrib
             },
-            precondition: ( (ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK,  (NOTEBOOK_EDITOR_FOCUSED.negate()))))
+            precondition: ( ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, ( NOTEBOOK_EDITOR_FOCUSED.negate())))
         });
     }
     async run(accessor) {
@@ -550,19 +544,15 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.history.next',
-            title: ( localize2(1896, 'Next value in history')),
+            title: ( localize2(6829, 'Next value in history')),
             category: interactiveWindowCategory,
             f1: false,
             keybinding: {
-                when: ( (ContextKeyExpr.and(
-                     (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('top')),
-                     (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')),
-                     (Context.Visible.toNegated())
-                ))),
-                primary: 18 ,
-                weight: 200
+                when: ( ContextKeyExpr.and(( INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('top')), ( INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')), ( Context.Visible.toNegated()))),
+                primary: KeyCode.DownArrow,
+                weight: KeybindingWeight.WorkbenchContrib
             },
-            precondition: ( (ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK,  (NOTEBOOK_EDITOR_FOCUSED.negate()))))
+            precondition: ( ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, ( NOTEBOOK_EDITOR_FOCUSED.negate())))
         });
     }
     async run(accessor) {
@@ -585,12 +575,12 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.scrollToTop',
-            title: ( localize(1897, 'Scroll to Top')),
+            title: ( localize(6830, 'Scroll to Top')),
             keybinding: {
-                when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
-                primary: 2048  | 14 ,
-                mac: { primary: 2048  | 16  },
-                weight: 200
+                when: ( ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')),
+                primary: KeyMod.CtrlCmd | KeyCode.Home,
+                mac: { primary: KeyMod.CtrlCmd | KeyCode.UpArrow },
+                weight: KeybindingWeight.WorkbenchContrib
             },
             category: interactiveWindowCategory,
         });
@@ -610,12 +600,12 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.scrollToBottom',
-            title: ( localize(1898, 'Scroll to Bottom')),
+            title: ( localize(6831, 'Scroll to Bottom')),
             keybinding: {
-                when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
-                primary: 2048  | 13 ,
-                mac: { primary: 2048  | 18  },
-                weight: 200
+                when: ( ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')),
+                primary: KeyMod.CtrlCmd | KeyCode.End,
+                mac: { primary: KeyMod.CtrlCmd | KeyCode.DownArrow },
+                weight: KeybindingWeight.WorkbenchContrib
             },
             category: interactiveWindowCategory,
         });
@@ -636,17 +626,12 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.input.focus',
-            title: ( localize2(1899, 'Focus Input Editor')),
+            title: ( localize2(6832, 'Focus Input Editor')),
             category: interactiveWindowCategory,
             menu: {
                 id: MenuId.CommandPalette,
-                when: InteractiveWindowOpen,
+                when: InteractiveWindowOpen
             },
-            keybinding: {
-                when: ( (ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED))),
-                weight: 200  + 5,
-                primary: 2048  | 18
-            }
         });
     }
     async run(accessor) {
@@ -656,7 +641,7 @@ registerAction2(class extends Action2 {
             editorService.activeEditorPane?.focus();
         }
         else {
-            const openEditors = editorService.getEditors(0 );
+            const openEditors = editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
             const interactiveWindow = Iterable.find(openEditors, identifier => { return identifier.editor.typeId === InteractiveEditorInput.ID; });
             if (interactiveWindow) {
                 const editorInput = interactiveWindow.editor;
@@ -674,26 +659,23 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.history.focus',
-            title: ( localize2(1900, 'Focus History')),
+            title: ( localize2(6833, 'Focus History')),
             category: interactiveWindowCategory,
             menu: {
                 id: MenuId.CommandPalette,
-                when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
+                when: ( ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')),
             },
             keybinding: [{
-                    when: ( (ContextKeyExpr.and(
-                         (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('bottom')),
-                         (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none'))
-                    ))),
-                    weight: 200  + 5,
-                    primary: 2048  | 16
+                    when: ( ContextKeyExpr.and(( INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('bottom')), ( INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')))),
+                    weight: KeybindingWeight.WorkbenchContrib + 5,
+                    primary: KeyMod.CtrlCmd | KeyCode.UpArrow
                 },
                 {
-                    when: ( (ContextKeyExpr.or(IsWindowsContext, IsLinuxContext))),
-                    weight: 200 ,
-                    primary: 2048  | 16 ,
+                    when: ( ContextKeyExpr.or(IsWindowsContext, IsLinuxContext)),
+                    weight: KeybindingWeight.WorkbenchContrib,
+                    primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
                 }],
-            precondition: ( (ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK,  (NOTEBOOK_EDITOR_FOCUSED.negate()))))
+            precondition: ( ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, ( NOTEBOOK_EDITOR_FOCUSED.negate())))
         });
     }
     async run(accessor) {
@@ -710,7 +692,7 @@ registerColor('interactive.activeCodeBorder', {
     hcDark: contrastBorder,
     hcLight: contrastBorder
 }, ( localize(
-    1901,
+    6834,
     'The border color for the current interactive code cell when the editor has focus.'
 )));
 registerColor('interactive.inactiveCodeBorder', {
@@ -719,19 +701,19 @@ registerColor('interactive.inactiveCodeBorder', {
     hcDark: PANEL_BORDER,
     hcLight: PANEL_BORDER
 }, ( localize(
-    1902,
+    6835,
     'The border color for the current interactive code cell when the editor does not have focus.'
 )));
-( (Registry.as(Extensions.Configuration))).registerConfiguration({
+( Registry.as(Extensions.Configuration)).registerConfiguration({
     id: 'interactiveWindow',
     order: 100,
     type: 'object',
     'properties': {
-        [InteractiveWindowSetting.interactiveWindowAlwaysScrollOnNewCell]: {
+        [ReplEditorSettings.interactiveWindowAlwaysScrollOnNewCell]: {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                1903,
+                6836,
                 "Automatically scroll the interactive window to show the output of the last statement executed. If this value is false, the window will only scroll if the last cell was already the one scrolled to."
             ))
         },
@@ -739,24 +721,24 @@ registerColor('interactive.inactiveCodeBorder', {
             type: 'boolean',
             default: false,
             markdownDescription: ( localize(
-                1904,
+                6837,
                 "Prompt to save the interactive window when it is closed. Only new interactive windows will be affected by this setting change."
             ))
         },
-        [InteractiveWindowSetting.executeWithShiftEnter]: {
+        [ReplEditorSettings.executeWithShiftEnter]: {
             type: 'boolean',
             default: false,
             markdownDescription: ( localize(
-                1905,
+                6838,
                 "Execute the Interactive Window (REPL) input box with shift+enter, so that enter can be used to create a newline."
             )),
             tags: ['replExecute']
         },
-        [InteractiveWindowSetting.showExecutionHint]: {
+        [ReplEditorSettings.showExecutionHint]: {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                1906,
+                6839,
                 "Display a hint in the Interactive Window (REPL) input box to indicate how to execute code."
             )),
             tags: ['replExecute']

package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveCommon.d.ts

@@ -0,0 +1,7 @@
+import { RawContextKey } from "vscode/vscode/vs/platform/contextkey/common/contextkey";
+export declare const INTERACTIVE_INPUT_CURSOR_BOUNDARY: RawContextKey<"both" | "none" | "top" | "bottom">;
+export declare const ReplEditorSettings: {
+    interactiveWindowAlwaysScrollOnNewCell: string;
+    executeWithShiftEnter: string;
+    showExecutionHint: string;
+};

package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveCommon.js

@@ -1,10 +1,11 @@
+
 import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 
 const INTERACTIVE_INPUT_CURSOR_BOUNDARY = ( new RawContextKey('interactiveInputCursorAtBoundary', 'none'));
-const InteractiveWindowSetting = {
+const ReplEditorSettings = {
     interactiveWindowAlwaysScrollOnNewCell: 'interactiveWindow.alwaysScrollOnNewCell',
     executeWithShiftEnter: 'interactiveWindow.executeWithShiftEnter',
-    showExecutionHint: 'interactiveWindow.showExecutionHint'
+    showExecutionHint: 'interactiveWindow.showExecutionHint',
 };
 
-export { INTERACTIVE_INPUT_CURSOR_BOUNDARY, InteractiveWindowSetting };
+export { INTERACTIVE_INPUT_CURSOR_BOUNDARY, ReplEditorSettings };