@codingame/monaco-vscode-interactive-service-override 6.0.2 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-interactive-service-override",
-  "version": "6.0.2",
+  "version": "7.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@6.0.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.0.0"
   }
 }

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

@@ -16,6 +16,7 @@ import { peekViewBorder } from 'vscode/vscode/vs/editor/contrib/peekView/browser
 import { Context } from 'vscode/vscode/vs/editor/contrib/suggest/browser/suggest';
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -46,15 +47,19 @@ import { INTERACTIVE_INPUT_CURSOR_BOUNDARY, InteractiveWindowSetting } from './i
 import 'vscode/vscode/vs/base/common/event';
 import { InteractiveEditor } from './interactiveEditor.js';
 import { InteractiveEditorInput } from 'vscode/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 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { executeIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { configIcon, executeIcon } from 'vscode/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, CellEditType, CellKind, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { InteractiveWindowOpen } from 'vscode/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 { executeReplInput } from '../../replNotebook/browser/repl.contribution.js';
+import { ReplEditor } from '../../replNotebook/browser/replEditor.js';
+import { ReplEditorInput } from '../../replNotebook/browser/replEditorInput.js';
 import { columnToEditorGroup } from 'vscode/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';
@@ -79,7 +84,7 @@ let InteractiveDocumentContribution = class InteractiveDocumentContribution exte
                 providerDisplayName: 'Interactive Notebook',
                 displayName: 'Interactive',
                 filenamePattern: ['*.interactive'],
-                exclusive: true
+                priority: RegisteredEditorPriority.exclusive
             }));
         }
         editorResolverService.registerEditor(`${Schemas.vscodeInteractiveInput}:/**`, {
@@ -343,10 +348,10 @@ registerAction2(class extends Action2 {
         InteractiveEditorInput.setName(notebookUri, title);
         logService.debug('Open new interactive window:', ( (notebookUri.toString())), ( (inputUri.toString())));
         if (id) {
-            const allKernels = kernelService.getMatchingKernel({ uri: notebookUri, viewType: 'interactive' }).all;
+            const allKernels = kernelService.getMatchingKernel({ uri: notebookUri, notebookType: 'interactive' }).all;
             const preferredKernel = allKernels.find(kernel => kernel.id === id);
             if (preferredKernel) {
-                kernelService.preselectKernelForNotebook(preferredKernel, { uri: notebookUri, viewType: 'interactive' });
+                kernelService.preselectKernelForNotebook(preferredKernel, { uri: notebookUri, notebookType: 'interactive' });
             }
         }
         historyService.clearHistory(notebookUri);
@@ -357,13 +362,34 @@ registerAction2(class extends Action2 {
         return { notebookUri, inputUri, notebookEditorId: editorControl?.notebookEditor?.getId() };
     }
 });
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'interactive.configure',
+            title: ( localize2WithPath(_moduleId, 2, 'Configure input box behavior')),
+            category: interactiveWindowCategory,
+            f1: false,
+            icon: configIcon,
+            menu: {
+                id: MenuId.InteractiveInputConfig
+            }
+        });
+    }
+    run(accessor, ...args) {
+        accessor.get(ICommandService).executeCommand('workbench.action.openSettings', '@tag:replExecute');
+    }
+});
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.execute',
-            title: ( localize2WithPath(_moduleId, 2, 'Execute Code')),
+            title: ( localize2WithPath(_moduleId, 3, 'Execute Code')),
             category: interactiveWindowCategory,
             keybinding: [{
+                    when: ( (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))
@@ -377,17 +403,13 @@ registerAction2(class extends Action2 {
                     ))),
                     primary: KeyCode.Enter,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
-                }, {
-                    when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
-                    primary: KeyMod.WinCtrl | KeyCode.Enter,
-                    win: {
-                        primary: KeyMod.CtrlCmd | KeyCode.Enter
-                    },
-                    weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }],
             menu: [
                 {
                     id: MenuId.InteractiveInputExecute
+                },
+                {
+                    id: MenuId.ReplInputExecute
                 }
             ],
             icon: executeIcon,
@@ -410,20 +432,27 @@ registerAction2(class extends Action2 {
         const historyService = accessor.get(IInteractiveHistoryService);
         const notebookEditorService = accessor.get(INotebookEditorService);
         let editorControl;
+        let isReplEditor = false;
         if (context) {
             const resourceUri = URI.revive(context);
-            const editors = editorService.findEditors(resourceUri)
-                .filter(id => id.editor instanceof InteractiveEditorInput && id.editor.resource?.toString() === ( (resourceUri.toString())));
-            if (editors.length) {
-                const editorInput = editors[0].editor;
-                const currentGroup = editors[0].groupId;
-                const editor = await editorService.openEditor(editorInput, currentGroup);
-                editorControl = editor?.getControl();
+            const editors = editorService.findEditors(resourceUri);
+            for (const found of editors) {
+                if (found.editor.typeId === ReplEditorInput.ID || found.editor.typeId === InteractiveEditorInput.ID) {
+                    const editor = await editorService.openEditor(found.editor, found.groupId);
+                    editorControl = editor?.getControl();
+                    isReplEditor = found.editor.typeId === ReplEditorInput.ID;
+                    break;
+                }
             }
         }
         else {
+            const editor = editorService.activeEditorPane;
+            isReplEditor = editor instanceof ReplEditor;
             editorControl = editorService.activeEditorPane?.getControl();
         }
+        if (editorControl && isReplEditor) {
+            executeReplInput(accessor, editorControl);
+        }
         if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
             const notebookDocument = editorControl.notebookEditor.textModel;
             const textModel = editorControl.codeEditor.getModel();
@@ -475,7 +504,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.input.clear',
-            title: ( localize2WithPath(_moduleId, 3, 'Clear the interactive window input editor contents')),
+            title: ( localize2WithPath(_moduleId, 4, 'Clear the interactive window input editor contents')),
             category: interactiveWindowCategory,
             f1: false
         });
@@ -497,19 +526,28 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.history.previous',
-            title: ( localize2WithPath(_moduleId, 4, 'Previous value in history')),
+            title: ( localize2WithPath(_moduleId, 5, 'Previous value in history')),
             category: interactiveWindowCategory,
             f1: false,
-            keybinding: {
-                when: ( (ContextKeyExpr.and(
-                     (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')),
-                     (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('bottom')),
-                     (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')),
-                     (Context.Visible.toNegated())
-                ))),
-                primary: KeyCode.UpArrow,
-                weight: KeybindingWeight.WorkbenchContrib
-            },
+            keybinding: [{
+                    when: ( (ContextKeyExpr.and(
+                         (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')),
+                         (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('bottom')),
+                         (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')),
+                         (Context.Visible.toNegated())
+                    ))),
+                    primary: KeyCode.UpArrow,
+                    weight: KeybindingWeight.WorkbenchContrib
+                }, {
+                    when: ( (ContextKeyExpr.and(
+                         (ContextKeyExpr.equals('activeEditor', 'workbench.editor.repl')),
+                         (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('bottom')),
+                         (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')),
+                         (Context.Visible.toNegated())
+                    ))),
+                    primary: KeyCode.UpArrow,
+                    weight: KeybindingWeight.WorkbenchContrib
+                }]
         });
     }
     async run(accessor) {
@@ -532,19 +570,28 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.history.next',
-            title: ( localize2WithPath(_moduleId, 5, 'Next value in history')),
+            title: ( localize2WithPath(_moduleId, 6, 'Next value in history')),
             category: interactiveWindowCategory,
             f1: false,
-            keybinding: {
-                when: ( (ContextKeyExpr.and(
-                     (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')),
-                     (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('top')),
-                     (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')),
-                     (Context.Visible.toNegated())
-                ))),
-                primary: KeyCode.DownArrow,
-                weight: KeybindingWeight.WorkbenchContrib
-            },
+            keybinding: [{
+                    when: ( (ContextKeyExpr.and(
+                         (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')),
+                         (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('top')),
+                         (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')),
+                         (Context.Visible.toNegated())
+                    ))),
+                    primary: KeyCode.DownArrow,
+                    weight: KeybindingWeight.WorkbenchContrib
+                }, {
+                    when: ( (ContextKeyExpr.and(
+                         (ContextKeyExpr.equals('activeEditor', 'workbench.editor.repl')),
+                         (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('top')),
+                         (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')),
+                         (Context.Visible.toNegated())
+                    ))),
+                    primary: KeyCode.DownArrow,
+                    weight: KeybindingWeight.WorkbenchContrib
+                }],
         });
     }
     async run(accessor) {
@@ -567,7 +614,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.scrollToTop',
-            title: ( localizeWithPath(_moduleId, 6, 'Scroll to Top')),
+            title: ( localizeWithPath(_moduleId, 7, 'Scroll to Top')),
             keybinding: {
                 when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
                 primary: KeyMod.CtrlCmd | KeyCode.Home,
@@ -592,7 +639,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.scrollToBottom',
-            title: ( localizeWithPath(_moduleId, 7, 'Scroll to Bottom')),
+            title: ( localizeWithPath(_moduleId, 8, 'Scroll to Bottom')),
             keybinding: {
                 when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
                 primary: KeyMod.CtrlCmd | KeyCode.End,
@@ -618,7 +665,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.input.focus',
-            title: ( localize2WithPath(_moduleId, 8, 'Focus Input Editor')),
+            title: ( localize2WithPath(_moduleId, 9, 'Focus Input Editor')),
             category: interactiveWindowCategory,
             menu: {
                 id: MenuId.CommandPalette,
@@ -652,7 +699,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.history.focus',
-            title: ( localize2WithPath(_moduleId, 9, 'Focus History')),
+            title: ( localize2WithPath(_moduleId, 10, 'Focus History')),
             category: interactiveWindowCategory,
             menu: {
                 id: MenuId.CommandPalette,
@@ -676,7 +723,7 @@ registerColor('interactive.activeCodeBorder', {
     hcLight: contrastBorder
 }, ( localizeWithPath(
     _moduleId,
-    10,
+    11,
     'The border color for the current interactive code cell when the editor has focus.'
 )));
 registerColor('interactive.inactiveCodeBorder', {
@@ -686,7 +733,7 @@ registerColor('interactive.inactiveCodeBorder', {
     hcLight: PANEL_BORDER
 }, ( localizeWithPath(
     _moduleId,
-    11,
+    12,
     'The border color for the current interactive code cell when the editor does not have focus.'
 )));
 ( (Registry.as(Extensions.Configuration))).registerConfiguration({
@@ -699,7 +746,7 @@ registerColor('interactive.inactiveCodeBorder', {
             default: true,
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                12,
+                13,
                 "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."
             ))
         },
@@ -708,18 +755,29 @@ registerColor('interactive.inactiveCodeBorder', {
             default: false,
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                13,
+                14,
                 "Prompt to save the interactive window when it is closed. Only new interactive windows will be affected by this setting change."
             ))
         },
-        ['interactiveWindow.executeWithShiftEnter']: {
+        [InteractiveWindowSetting.executeWithShiftEnter]: {
+            type: 'boolean',
+            default: false,
+            markdownDescription: ( localizeWithPath(
+                _moduleId,
+                15,
+                "Execute the Interactive Window (REPL) input box with shift+enter, so that enter can be used to create a newline."
+            )),
+            tags: ['replExecute']
+        },
+        [InteractiveWindowSetting.showExecutionHint]: {
             type: 'boolean',
             default: true,
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                14,
-                "Execute the interactive window (REPL) input box with shift+enter, so that enter can be used to create a newline."
-            ))
+                16,
+                "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.js

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