@codingame/monaco-vscode-interactive-service-override 5.3.0 → 6.0.0

package/package.json

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

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

@@ -1,5 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 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 +21,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';
@@ -35,8 +38,8 @@ 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 { 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';
@@ -48,7 +51,7 @@ import { IInteractiveHistoryService } from 'vscode/vscode/vs/workbench/contrib/i
 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 { 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 { 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';
@@ -88,7 +91,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;
             }
         });
@@ -205,7 +208,7 @@ InteractiveWindowWorkingCopyEditorHandler = ( (__decorate([
     ( (__param(1, IWorkingCopyEditorService))),
     ( (__param(2, IExtensionService)))
 ], InteractiveWindowWorkingCopyEditorHandler)));
-registerWorkbenchContribution2(InteractiveDocumentContribution.ID, InteractiveDocumentContribution, 2 );
+registerWorkbenchContribution2(InteractiveDocumentContribution.ID, InteractiveDocumentContribution, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(InteractiveInputContentProvider.ID, InteractiveInputContentProvider, {
     editorTypeId: INTERACTIVE_WINDOW_EDITOR_ID
 });
@@ -322,7 +325,7 @@ registerAction2(class extends Action2 {
             }
         }
         const existingNotebookDocument = ( (new Set()));
-        editorService.getEditors(1 ).forEach(editor => {
+        editorService.getEditors(EditorsOrder.SEQUENTIAL).forEach(editor => {
             if (editor.editor.resource) {
                 existingNotebookDocument.add(( (editor.editor.resource.toString())));
             }
@@ -360,14 +363,28 @@ registerAction2(class extends Action2 {
             id: 'interactive.execute',
             title: ( localize2WithPath(_moduleId, 2, 'Execute Code')),
             category: interactiveWindowCategory,
-            keybinding: {
-                when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
-                primary: 256  | 3 ,
-                win: {
-                    primary: 2048  | 3
-                },
-                weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
-            },
+            keybinding: [{
+                    when: ( (ContextKeyExpr.and(
+                         (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: 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
@@ -428,7 +445,7 @@ registerAction2(class extends Action2 {
                     undefined;
                 await bulkEditService.apply([
                     ( (new ResourceNotebookCellEdit(notebookDocument.uri, {
-                        editType: 1 ,
+                        editType: CellEditType.Replace,
                         index: index,
                         count: 0,
                         cells: [{
@@ -490,8 +507,8 @@ registerAction2(class extends Action2 {
                      (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')),
                      (Context.Visible.toNegated())
                 ))),
-                primary: 16 ,
-                weight: 200
+                primary: KeyCode.UpArrow,
+                weight: KeybindingWeight.WorkbenchContrib
             },
         });
     }
@@ -525,8 +542,8 @@ registerAction2(class extends Action2 {
                      (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')),
                      (Context.Visible.toNegated())
                 ))),
-                primary: 18 ,
-                weight: 200
+                primary: KeyCode.DownArrow,
+                weight: KeybindingWeight.WorkbenchContrib
             },
         });
     }
@@ -553,9 +570,9 @@ registerAction2(class extends Action2 {
             title: ( localizeWithPath(_moduleId, 6, 'Scroll to Top')),
             keybinding: {
                 when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
-                primary: 2048  | 14 ,
-                mac: { primary: 2048  | 16  },
-                weight: 200
+                primary: KeyMod.CtrlCmd | KeyCode.Home,
+                mac: { primary: KeyMod.CtrlCmd | KeyCode.UpArrow },
+                weight: KeybindingWeight.WorkbenchContrib
             },
             category: interactiveWindowCategory,
         });
@@ -578,9 +595,9 @@ registerAction2(class extends Action2 {
             title: ( localizeWithPath(_moduleId, 7, 'Scroll to Bottom')),
             keybinding: {
                 when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
-                primary: 2048  | 13 ,
-                mac: { primary: 2048  | 18  },
-                weight: 200
+                primary: KeyMod.CtrlCmd | KeyCode.End,
+                mac: { primary: KeyMod.CtrlCmd | KeyCode.DownArrow },
+                weight: KeybindingWeight.WorkbenchContrib
             },
             category: interactiveWindowCategory,
         });
@@ -617,7 +634,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;
@@ -685,14 +702,7 @@ registerColor('interactive.inactiveCodeBorder', {
                 12,
                 "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."
             ))
-        }
-    }
-});
-( (Registry.as(Extensions.Configuration))).registerConfiguration({
-    id: 'interactiveWindow',
-    order: 100,
-    type: 'object',
-    'properties': {
+        },
         [NotebookSetting.InteractiveWindowPromptToSave]: {
             type: 'boolean',
             default: false,
@@ -701,6 +711,15 @@ registerColor('interactive.inactiveCodeBorder', {
                 13,
                 "Prompt to save the interactive window when it is closed. Only new interactive windows will be affected by this setting change."
             ))
+        },
+        ['interactiveWindow.executeWithShiftEnter']: {
+            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."
+            ))
         }
     }
 });

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

@@ -23,10 +23,12 @@ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
+import { EditorPaneSelectionChangeReason } from 'vscode/vscode/vs/workbench/common/editor';
 import { getSimpleEditorOptions } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { InteractiveEditorInput } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
 import { NotebookEditorExtensionsRegistry } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { INotebookEditorService } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
+import { GroupsOrder } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { ExecutionStateCellStatusBarContrib, TimerCellStatusBarContrib } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
@@ -51,6 +53,7 @@ import { SnippetController2 } from 'vscode/vscode/vs/editor/contrib/snippet/brow
 import { TabCompletionController } from 'vscode/vscode/vs/workbench/contrib/snippets/browser/tabCompletion';
 import { MarkerController } from 'vscode/vscode/vs/editor/contrib/gotoError/browser/gotoError';
 import { ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
+import { TextEditorSelectionSource } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { NotebookExecutionType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { NOTEBOOK_KERNEL } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
@@ -252,7 +255,7 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
         if (result) {
             return result;
         }
-        for (const group of this._editorGroupService.getGroups(1 )) {
+        for (const group of this._editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
             if (group.activeEditorPane !== this && group.activeEditorPane === this && group.activeEditor?.matches(input)) {
                 const notebook = this._notebookWidget.value?.getEditorViewState();
                 const input = this._codeEditorWidget.saveViewState();
@@ -372,7 +375,7 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
             }
         }));
         this._widgetDisposableStore.add(this._codeEditorWidget.onDidChangeCursorPosition(e => this._onDidChangeSelection.fire({ reason: this._toEditorPaneSelectionChangeReason(e) })));
-        this._widgetDisposableStore.add(this._codeEditorWidget.onDidChangeModelContent(() => this._onDidChangeSelection.fire({ reason: 3  })));
+        this._widgetDisposableStore.add(this._codeEditorWidget.onDidChangeModelContent(() => this._onDidChangeSelection.fire({ reason: EditorPaneSelectionChangeReason.EDIT })));
         this._widgetDisposableStore.add(this._notebookKernelService.onDidChangeNotebookAffinity(this._syncWithKernel, this));
         this._widgetDisposableStore.add(this._notebookKernelService.onDidChangeSelectedNotebooks(this._syncWithKernel, this));
         this._widgetDisposableStore.add(this.themeService.onDidColorThemeChange(() => {
@@ -431,10 +434,10 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
     }
     _toEditorPaneSelectionChangeReason(e) {
         switch (e.source) {
-            case "api" : return 1 ;
-            case "code.navigation" : return 4 ;
-            case "code.jump" : return 5 ;
-            default: return 2 ;
+            case TextEditorSelectionSource.PROGRAMMATIC: return EditorPaneSelectionChangeReason.PROGRAMMATIC;
+            case TextEditorSelectionSource.NAVIGATION: return EditorPaneSelectionChangeReason.NAVIGATION;
+            case TextEditorSelectionSource.JUMP: return EditorPaneSelectionChangeReason.JUMP;
+            default: return EditorPaneSelectionChangeReason.USER;
         }
     }
     _cellAtBottom(cell) {