@codingame/monaco-vscode-interactive-service-override 9.0.3 → 10.0.1

package/package.json

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

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

@@ -1,6 +1,5 @@
 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';
@@ -21,9 +20,7 @@ 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';
@@ -38,8 +35,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, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
-import { EditorExtensions, EditorsOrder } from 'vscode/vscode/vs/workbench/common/editor';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { EditorExtensions } 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';
@@ -52,8 +49,8 @@ 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, CellEditType, CellKind, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { InteractiveWindowOpen } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+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 { 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';
@@ -63,8 +60,11 @@ import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/edit
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 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 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { IsWindowsContext, IsLinuxContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 
-const interactiveWindowCategory = ( localize2(2363, "Interactive Window"));
+const interactiveWindowCategory = ( localize2(2350, "Interactive Window"));
 ( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(InteractiveEditor, INTERACTIVE_WINDOW_EDITOR_ID, 'Interactive Window'), [
     ( (new SyncDescriptor(InteractiveEditorInput)))
 ]);
@@ -91,7 +91,7 @@ let InteractiveDocumentContribution = class InteractiveDocumentContribution exte
             singlePerResource: true
         }, {
             createEditorInput: ({ resource }) => {
-                const editorInput = editorService.getEditors(EditorsOrder.SEQUENTIAL).find(editor => editor.editor instanceof InteractiveEditorInput && ( (editor.editor.inputResource.toString())) === ( (resource.toString())));
+                const editorInput = editorService.getEditors(1 ).find(editor => editor.editor instanceof InteractiveEditorInput && ( (editor.editor.inputResource.toString())) === ( (resource.toString())));
                 return editorInput;
             }
         });
@@ -216,7 +216,7 @@ let InteractiveWindowWorkingCopyEditorHandler = class InteractiveWindowWorkingCo
         this._register(this._workingCopyEditorService.registerHandler(this));
     }
     _getViewType(workingCopy) {
-        return NotebookWorkingCopyTypeIdentifier.parse(workingCopy.typeId);
+        return NotebookWorkingCopyTypeIdentifier.parse(workingCopy.typeId)?.viewType;
     }
 };
 InteractiveWindowWorkingCopyEditorHandler = ( (__decorate([
@@ -224,7 +224,7 @@ InteractiveWindowWorkingCopyEditorHandler = ( (__decorate([
     ( (__param(1, IWorkingCopyEditorService))),
     ( (__param(2, IExtensionService)))
 ], InteractiveWindowWorkingCopyEditorHandler)));
-registerWorkbenchContribution2(InteractiveDocumentContribution.ID, InteractiveDocumentContribution, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(InteractiveDocumentContribution.ID, InteractiveDocumentContribution, 2 );
 registerWorkbenchContribution2(InteractiveInputContentProvider.ID, InteractiveInputContentProvider, {
     editorTypeId: INTERACTIVE_WINDOW_EDITOR_ID
 });
@@ -269,11 +269,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: '_interactive.open',
-            title: ( localize2(2364, 'Open Interactive Window')),
+            title: ( localize2(2351, 'Open Interactive Window')),
             f1: false,
             category: interactiveWindowCategory,
             metadata: {
-                description: ( localize(2364, 'Open Interactive Window')),
+                description: ( localize(2351, 'Open Interactive Window')),
                 args: [
                     {
                         name: 'showOptions',
@@ -341,7 +341,7 @@ registerAction2(class extends Action2 {
             }
         }
         const existingNotebookDocument = ( (new Set()));
-        editorService.getEditors(EditorsOrder.SEQUENTIAL).forEach(editor => {
+        editorService.getEditors(1 ).forEach(editor => {
             if (editor.editor.resource) {
                 existingNotebookDocument.add(( (editor.editor.resource.toString())));
             }
@@ -377,25 +377,25 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.execute',
-            title: ( localize2(2365, 'Execute Code')),
+            title: ( localize2(2352, 'Execute Code')),
             category: interactiveWindowCategory,
             keybinding: [{
                     when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
-                    primary: KeyMod.CtrlCmd | KeyCode.Enter,
+                    primary: 2048  | 3 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }, {
                     when: ( (ContextKeyExpr.and(
                          (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')),
                          (ContextKeyExpr.equals('config.interactiveWindow.executeWithShiftEnter', true))
                     ))),
-                    primary: KeyMod.Shift | KeyCode.Enter,
+                    primary: 1024  | 3 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }, {
                     when: ( (ContextKeyExpr.and(
                          (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive')),
                          (ContextKeyExpr.equals('config.interactiveWindow.executeWithShiftEnter', false))
                     ))),
-                    primary: KeyCode.Enter,
+                    primary: 3 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }],
             menu: [
@@ -437,9 +437,9 @@ registerAction2(class extends Action2 {
         else {
             editorControl = editorService.activeEditorPane?.getControl();
         }
-        if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+        if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
             const notebookDocument = editorControl.notebookEditor.textModel;
-            const textModel = editorControl.codeEditor.getModel();
+            const textModel = editorControl.activeCodeEditor.getModel();
             const activeKernel = editorControl.notebookEditor.activeKernel;
             const language = activeKernel?.supportedLanguages[0] ?? PLAINTEXT_LANGUAGE_ID;
             if (notebookDocument && textModel) {
@@ -448,6 +448,10 @@ registerAction2(class extends Action2 {
                 if (isFalsyOrWhitespace(value)) {
                     return;
                 }
+                const ctrl = InlineChatController.get(editorControl.activeCodeEditor);
+                if (ctrl) {
+                    ctrl.acceptHunk();
+                }
                 historyService.replaceLast(notebookDocument.uri, value);
                 historyService.addToHistory(notebookDocument.uri, '');
                 textModel.setValue('');
@@ -459,7 +463,7 @@ registerAction2(class extends Action2 {
                     undefined;
                 await bulkEditService.apply([
                     ( (new ResourceNotebookCellEdit(notebookDocument.uri, {
-                        editType: CellEditType.Replace,
+                        editType: 1 ,
                         index: index,
                         count: 0,
                         cells: [{
@@ -489,7 +493,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.input.clear',
-            title: ( localize2(2366, 'Clear the interactive window input editor contents')),
+            title: ( localize2(2353, 'Clear the interactive window input editor contents')),
             category: interactiveWindowCategory,
             f1: false
         });
@@ -497,12 +501,12 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const editorService = accessor.get(IEditorService);
         const editorControl = editorService.activeEditorPane?.getControl();
-        if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+        if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
             const notebookDocument = editorControl.notebookEditor.textModel;
-            const textModel = editorControl.codeEditor.getModel();
-            const range = editorControl.codeEditor.getModel()?.getFullModelRange();
+            const textModel = editorControl.activeCodeEditor.getModel();
+            const range = editorControl.activeCodeEditor.getModel()?.getFullModelRange();
             if (notebookDocument && textModel && range) {
-                editorControl.codeEditor.executeEdits('', [EditOperation.replace(range, null)]);
+                editorControl.activeCodeEditor.executeEdits('', [EditOperation.replace(range, null)]);
             }
         }
     }
@@ -511,37 +515,28 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.history.previous',
-            title: ( localize2(2367, 'Previous value in history')),
+            title: ( localize2(2354, '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
-                }, {
-                    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
-                }]
+            keybinding: {
+                when: ( (ContextKeyExpr.and(
+                     (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('bottom')),
+                     (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')),
+                     (Context.Visible.toNegated())
+                ))),
+                primary: 16 ,
+                weight: 200
+            },
+            precondition: ( (ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK,  (NOTEBOOK_EDITOR_FOCUSED.negate()))))
         });
     }
     async run(accessor) {
         const editorService = accessor.get(IEditorService);
         const historyService = accessor.get(IInteractiveHistoryService);
         const editorControl = editorService.activeEditorPane?.getControl();
-        if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+        if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
             const notebookDocument = editorControl.notebookEditor.textModel;
-            const textModel = editorControl.codeEditor.getModel();
+            const textModel = editorControl.activeCodeEditor.getModel();
             if (notebookDocument && textModel) {
                 const previousValue = historyService.getPreviousValue(notebookDocument.uri);
                 if (previousValue) {
@@ -555,37 +550,28 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.history.next',
-            title: ( localize2(2368, 'Next value in history')),
+            title: ( localize2(2355, '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
-                }, {
-                    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
-                }],
+            keybinding: {
+                when: ( (ContextKeyExpr.and(
+                     (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('top')),
+                     (INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none')),
+                     (Context.Visible.toNegated())
+                ))),
+                primary: 18 ,
+                weight: 200
+            },
+            precondition: ( (ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK,  (NOTEBOOK_EDITOR_FOCUSED.negate()))))
         });
     }
     async run(accessor) {
         const editorService = accessor.get(IEditorService);
         const historyService = accessor.get(IInteractiveHistoryService);
         const editorControl = editorService.activeEditorPane?.getControl();
-        if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+        if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
             const notebookDocument = editorControl.notebookEditor.textModel;
-            const textModel = editorControl.codeEditor.getModel();
+            const textModel = editorControl.activeCodeEditor.getModel();
             if (notebookDocument && textModel) {
                 const nextValue = historyService.getNextValue(notebookDocument.uri);
                 if (nextValue !== null) {
@@ -599,12 +585,12 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.scrollToTop',
-            title: ( localize(2369, 'Scroll to Top')),
+            title: ( localize(2356, 'Scroll to Top')),
             keybinding: {
                 when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
-                primary: KeyMod.CtrlCmd | KeyCode.Home,
-                mac: { primary: KeyMod.CtrlCmd | KeyCode.UpArrow },
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 2048  | 14 ,
+                mac: { primary: 2048  | 16  },
+                weight: 200
             },
             category: interactiveWindowCategory,
         });
@@ -612,7 +598,7 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const editorService = accessor.get(IEditorService);
         const editorControl = editorService.activeEditorPane?.getControl();
-        if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+        if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
             if (editorControl.notebookEditor.getLength() === 0) {
                 return;
             }
@@ -624,12 +610,12 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.scrollToBottom',
-            title: ( localize(2370, 'Scroll to Bottom')),
+            title: ( localize(2357, 'Scroll to Bottom')),
             keybinding: {
                 when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
-                primary: KeyMod.CtrlCmd | KeyCode.End,
-                mac: { primary: KeyMod.CtrlCmd | KeyCode.DownArrow },
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 2048  | 13 ,
+                mac: { primary: 2048  | 18  },
+                weight: 200
             },
             category: interactiveWindowCategory,
         });
@@ -637,7 +623,7 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const editorService = accessor.get(IEditorService);
         const editorControl = editorService.activeEditorPane?.getControl();
-        if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+        if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
             if (editorControl.notebookEditor.getLength() === 0) {
                 return;
             }
@@ -650,30 +636,34 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.input.focus',
-            title: ( localize2(2371, 'Focus Input Editor')),
+            title: ( localize2(2358, 'Focus Input Editor')),
             category: interactiveWindowCategory,
             menu: {
                 id: MenuId.CommandPalette,
                 when: InteractiveWindowOpen,
             },
-            precondition: InteractiveWindowOpen,
+            keybinding: {
+                when: ( (ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED))),
+                weight: 200  + 5,
+                primary: 2048  | 18
+            }
         });
     }
     async run(accessor) {
         const editorService = accessor.get(IEditorService);
         const editorControl = editorService.activeEditorPane?.getControl();
-        if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+        if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
             editorService.activeEditorPane?.focus();
         }
         else {
-            const openEditors = editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
+            const openEditors = editorService.getEditors(0 );
             const interactiveWindow = Iterable.find(openEditors, identifier => { return identifier.editor.typeId === InteractiveEditorInput.ID; });
             if (interactiveWindow) {
                 const editorInput = interactiveWindow.editor;
                 const currentGroup = interactiveWindow.groupId;
                 const editor = await editorService.openEditor(editorInput, currentGroup);
                 const editorControl = editor?.getControl();
-                if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+                if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
                     editorService.activeEditorPane?.focus();
                 }
             }
@@ -684,19 +674,32 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'interactive.history.focus',
-            title: ( localize2(2372, 'Focus History')),
+            title: ( localize2(2359, 'Focus History')),
             category: interactiveWindowCategory,
             menu: {
                 id: MenuId.CommandPalette,
                 when: ( (ContextKeyExpr.equals('activeEditor', 'workbench.editor.interactive'))),
             },
-            precondition: ( (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.or(IsWindowsContext, IsLinuxContext))),
+                    weight: 200 ,
+                    primary: 2048  | 16 ,
+                }],
+            precondition: ( (ContextKeyExpr.and(IS_COMPOSITE_NOTEBOOK,  (NOTEBOOK_EDITOR_FOCUSED.negate()))))
         });
     }
     async run(accessor) {
         const editorService = accessor.get(IEditorService);
         const editorControl = editorService.activeEditorPane?.getControl();
-        if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
+        if (editorControl && isReplEditorControl(editorControl) && editorControl.notebookEditor) {
             editorControl.notebookEditor.focus();
         }
     }
@@ -707,7 +710,7 @@ registerColor('interactive.activeCodeBorder', {
     hcDark: contrastBorder,
     hcLight: contrastBorder
 }, ( localize(
-    2373,
+    2360,
     'The border color for the current interactive code cell when the editor has focus.'
 )));
 registerColor('interactive.inactiveCodeBorder', {
@@ -716,7 +719,7 @@ registerColor('interactive.inactiveCodeBorder', {
     hcDark: PANEL_BORDER,
     hcLight: PANEL_BORDER
 }, ( localize(
-    2374,
+    2361,
     'The border color for the current interactive code cell when the editor does not have focus.'
 )));
 ( (Registry.as(Extensions.Configuration))).registerConfiguration({
@@ -728,7 +731,7 @@ registerColor('interactive.inactiveCodeBorder', {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                2375,
+                2362,
                 "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."
             ))
         },
@@ -736,7 +739,7 @@ registerColor('interactive.inactiveCodeBorder', {
             type: 'boolean',
             default: false,
             markdownDescription: ( localize(
-                2376,
+                2363,
                 "Prompt to save the interactive window when it is closed. Only new interactive windows will be affected by this setting change."
             ))
         },
@@ -744,7 +747,7 @@ registerColor('interactive.inactiveCodeBorder', {
             type: 'boolean',
             default: false,
             markdownDescription: ( localize(
-                2377,
+                2364,
                 "Execute the Interactive Window (REPL) input box with shift+enter, so that enter can be used to create a newline."
             )),
             tags: ['replExecute']
@@ -753,7 +756,7 @@ registerColor('interactive.inactiveCodeBorder', {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                2378,
+                2365,
                 "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/interactiveEditor.css.js

@@ -1,6 +1,6 @@
 import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".interactive-editor .input-cell-container:focus-within .input-editor-container .monaco-editor{outline:solid 1px var(--vscode-notebook-focusedCellBorder)}.interactive-editor .input-cell-container .input-editor-container .monaco-editor{outline:solid 1px var(--vscode-notebook-inactiveFocusedCellBorder)}.interactive-editor .input-cell-container .input-focus-indicator{top:8px}.interactive-editor .input-cell-container .margin-view-overlays,.interactive-editor .input-cell-container .monaco-editor-background{background-color:var(--vscode-notebook-cellEditorBackground,var(--vscode-editor-background))}";
+var css = ".interactive-editor .input-cell-container:focus-within .input-editor-container>.monaco-editor{outline:solid 1px var(--vscode-notebook-focusedCellBorder)}.interactive-editor .input-cell-container .input-editor-container>.monaco-editor{outline:solid 1px var(--vscode-notebook-inactiveFocusedCellBorder)}.interactive-editor .input-cell-container .input-focus-indicator{top:8px}.interactive-editor .input-cell-container .margin-view-overlays,.interactive-editor .input-cell-container .monaco-editor-background{background-color:var(--vscode-notebook-cellEditorBackground,var(--vscode-editor-background))}";
 n(css,{});
 
 export { css, css as default };

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/interactive.css.js';
 import { $, append, createStyleSheet, Dimension } from 'vscode/vscode/vs/base/browser/dom';
-import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
@@ -11,12 +11,10 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 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';
@@ -41,7 +39,6 @@ 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';
@@ -51,10 +48,11 @@ import { NotebookFindContrib } from 'vscode/vscode/vs/workbench/contrib/notebook
 import { INTERACTIVE_WINDOW_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import './interactiveEditor.css.js';
 import { deepClone } from 'vscode/vscode/vs/base/common/objects';
-import { ContentHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/contentHoverController2';
-import { MarginHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/marginHoverController';
+import { ContentHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/contentHoverController';
+import { GlyphHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/glyphHoverController';
 import { ReplInputHintContentWidget } from './replInputHintContentWidget.js';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
+import { INLINE_CHAT_ID } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 
 const DECORATION_KEY = 'interactiveInputDecoration';
 const INTERACTIVE_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'InteractiveEditorViewState';
@@ -240,7 +238,7 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
         if (result) {
             return result;
         }
-        for (const group of this._editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
+        for (const group of this._editorGroupService.getGroups(1 )) {
             if (group.activeEditorPane !== this && group.activeEditorPane === this && group.activeEditor?.matches(input)) {
                 const notebook = this._notebookWidget.value?.getEditorViewState();
                 const input = this._codeEditorWidget.saveViewState();
@@ -258,7 +256,7 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
         this._codeEditorWidget?.dispose();
         this._widgetDisposableStore.clear();
         this._notebookWidget = this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, this.group.id, notebookInput, {
-            isEmbedded: true,
+            isReplHistory: true,
             isReadOnly: true,
             contributions: NotebookEditorExtensionsRegistry.getSomeEditorContributions([
                 ExecutionStateCellStatusBarContrib.id,
@@ -278,7 +276,7 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
                 SelectionClipboardContributionID,
                 ContextMenuController.ID,
                 ContentHoverController.ID,
-                MarginHoverController.ID,
+                GlyphHoverController.ID,
                 MarkerController.ID
             ]),
             options: this._notebookOptions,
@@ -296,8 +294,9 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
                     SnippetController2.ID,
                     TabCompletionController.ID,
                     ContentHoverController.ID,
-                    MarginHoverController.ID,
-                    MarkerController.ID
+                    GlyphHoverController.ID,
+                    MarkerController.ID,
+                    INLINE_CHAT_ID
                 ])
             }
         });
@@ -362,7 +361,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: EditorPaneSelectionChangeReason.EDIT })));
+        this._widgetDisposableStore.add(this._codeEditorWidget.onDidChangeModelContent(() => this._onDidChangeSelection.fire({ reason: 3  })));
         this._widgetDisposableStore.add(this._notebookKernelService.onDidChangeNotebookAffinity(this._syncWithKernel, this));
         this._widgetDisposableStore.add(this._notebookKernelService.onDidChangeSelectedNotebooks(this._syncWithKernel, this));
         this._widgetDisposableStore.add(this.themeService.onDidColorThemeChange(() => {
@@ -375,6 +374,11 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
                 this._updateInputHint();
             }
         }));
+        this._codeEditorWidget.onDidChangeModelDecorations(() => {
+            if (this.isVisible()) {
+                this._updateInputHint();
+            }
+        });
         this._widgetDisposableStore.add(this._codeEditorWidget.onDidChangeModel(() => {
             this._updateInputHint();
         }));
@@ -433,10 +437,10 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
     }
     _toEditorPaneSelectionChangeReason(e) {
         switch (e.source) {
-            case TextEditorSelectionSource.PROGRAMMATIC: return EditorPaneSelectionChangeReason.PROGRAMMATIC;
-            case TextEditorSelectionSource.NAVIGATION: return EditorPaneSelectionChangeReason.NAVIGATION;
-            case TextEditorSelectionSource.JUMP: return EditorPaneSelectionChangeReason.JUMP;
-            default: return EditorPaneSelectionChangeReason.USER;
+            case "api" : return 1 ;
+            case "code.navigation" : return 4 ;
+            case "code.jump" : return 5 ;
+            default: return 2 ;
         }
     }
     _cellAtBottom(cell) {
@@ -502,13 +506,20 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
     _validateDimension(width, height) {
         return new Dimension(Math.max(0, width), Math.max(0, height));
     }
+    _hasConflictingDecoration() {
+        return Boolean(this._codeEditorWidget.getLineDecorations(1)?.find((d) => d.options.beforeContentClassName
+            || d.options.afterContentClassName
+            || d.options.before?.content
+            || d.options.after?.content));
+    }
     _updateInputHint() {
         if (!this._codeEditorWidget) {
             return;
         }
         const shouldHide = !this._codeEditorWidget.hasModel() ||
             this._configurationService.getValue(InteractiveWindowSetting.showExecutionHint) === false ||
-            this._codeEditorWidget.getModel().getValueLength() !== 0;
+            this._codeEditorWidget.getModel().getValueLength() !== 0 ||
+            this._hasConflictingDecoration();
         if (!this._hintElement && !shouldHide) {
             this._hintElement = this._instantiationService.createInstance(ReplInputHintContentWidget, this._codeEditorWidget);
         }
@@ -558,7 +569,8 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
     getControl() {
         return {
             notebookEditor: this._notebookWidget.value,
-            codeEditor: this._codeEditorWidget
+            activeCodeEditor: this._codeEditorWidget,
+            onDidChangeActiveEditor: Event.None
         };
     }
 };

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

@@ -5,12 +5,9 @@ import { KeybindingLabel } from 'vscode/vscode/vs/base/browser/ui/keybindingLabe
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { OS } from 'vscode/vscode/vs/base/common/platform';
-import { ContentWidgetPositionPreference } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
-import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { InteractiveWindowSetting } from './interactiveCommon.js';
 
 var ReplInputHintContentWidget_1;
@@ -24,13 +21,13 @@ let ReplInputHintContentWidget = class ReplInputHintContentWidget extends Dispos
         this.keybindingService = keybindingService;
         this.ariaLabel = '';
         this._register(this.editor.onDidChangeConfiguration((e) => {
-            if (this.domNode && e.hasChanged(EditorOption.fontInfo)) {
+            if (this.domNode && e.hasChanged(52 )) {
                 this.editor.applyFontInfo(this.domNode);
             }
         }));
         const onDidFocusEditorText = Event.debounce(this.editor.onDidFocusEditorText, () => undefined, 500);
         this._register(onDidFocusEditorText(() => {
-            if (this.editor.hasTextFocus() && this.ariaLabel && configurationService.getValue(AccessibilityVerbositySettingId.ReplInputHint)) {
+            if (this.editor.hasTextFocus() && this.ariaLabel && configurationService.getValue("accessibility.verbosity.replInputHint" )) {
                 status(this.ariaLabel);
             }
         }));
@@ -47,7 +44,7 @@ let ReplInputHintContentWidget = class ReplInputHintContentWidget extends Dispos
     getPosition() {
         return {
             position: { lineNumber: 1, column: 1 },
-            preference: [ContentWidgetPositionPreference.EXACT]
+            preference: [0 ]
         };
     }
     getDomNode() {
@@ -76,7 +73,7 @@ let ReplInputHintContentWidget = class ReplInputHintContentWidget extends Dispos
         const keybinding = this.getKeybinding();
         const keybindingHintLabel = keybinding?.getLabel();
         if (keybinding && keybindingHintLabel) {
-            const actionPart = ( localize(10150, 'Press {0} to execute. ', keybindingHintLabel));
+            const actionPart = ( localize(10246, 'Press {0} to execute. ', keybindingHintLabel));
             const [before, after] = ( (actionPart.split(keybindingHintLabel).map((fragment) => {
                 const hintPart = $('span', undefined, fragment);
                 hintPart.style.fontStyle = 'italic';
@@ -89,10 +86,14 @@ let ReplInputHintContentWidget = class ReplInputHintContentWidget extends Dispos
             label.element.style.display = 'inline';
             hintElement.appendChild(after);
             this.domNode.append(hintElement);
-            this.ariaLabel = actionPart.concat(( localize(
-                10151,
+            const helpKeybinding = this.keybindingService.lookupKeybinding("editor.action.accessibilityHelp" )?.getLabel();
+            const helpInfo = helpKeybinding
+                ? ( localize(10247, "Use {0} for accessibility help. ", helpKeybinding))
+                : ( localize(10248, "Run the Open Accessibility Help command for more information. "));
+            this.ariaLabel = helpInfo.concat(actionPart, ( localize(
+                10249,
                 ' Toggle {0} in settings to disable this hint.',
-                AccessibilityVerbositySettingId.ReplInputHint
+                "accessibility.verbosity.replInputHint"
             )));
         }
     }

package/vscode/src/vs/workbench/contrib/replNotebook/browser/interactiveEditor.css.js

@@ -0,0 +1,6 @@
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+
+var css = ".interactive-editor .input-cell-container:focus-within .input-editor-container>.monaco-editor{outline:solid 1px var(--vscode-notebook-focusedCellBorder)}.interactive-editor .input-cell-container .input-editor-container>.monaco-editor{outline:solid 1px var(--vscode-notebook-inactiveFocusedCellBorder)}.interactive-editor .input-cell-container .input-focus-indicator{top:8px}.interactive-editor .input-cell-container .margin-view-overlays,.interactive-editor .input-cell-container .monaco-editor-background{background-color:var(--vscode-notebook-cellEditorBackground,var(--vscode-editor-background))}";
+n(css,{});
+
+export { css, css as default };

package/vscode/src/vs/workbench/contrib/replNotebook/browser/media/interactive.css.js

@@ -0,0 +1,6 @@
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+
+var css = ".interactive-editor .input-cell-container{box-sizing:border-box}.interactive-editor .input-cell-container .input-focus-indicator{height:19px;left:0;position:absolute}.interactive-editor .input-cell-container .input-focus-indicator:before{border-left:3px solid transparent;border-radius:2px;content:\"\";height:100%;left:0;margin-left:4px;position:absolute;top:0;width:0;z-index:10}.interactive-editor .input-cell-container .run-button-container{position:absolute}.interactive-editor .input-cell-container .run-button-container .monaco-toolbar .actions-container{justify-content:center}";
+n(css,{});
+
+export { css, css as default };

package/vscode/src/vs/workbench/contrib/replNotebook/browser/replEditor.js

@@ -0,0 +1,50 @@
+import './media/interactive.css.js';
+import 'vscode/vscode/vs/base/browser/dom';
+import 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
+import 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
+import 'vscode/vscode/vs/editor/contrib/contextmenu/browser/contextmenu';
+import 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
+import 'vscode/vscode/vs/editor/contrib/suggest/browser/suggestController';
+import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/menuPreventer';
+import 'vscode/vscode/vs/workbench/contrib/snippets/browser/tabCompletion';
+import 'vscode/vscode/vs/editor/browser/editorExtensions';
+import 'vscode/vscode/vs/platform/theme/common/themeService';
+import 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+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 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { NotebookEditorWidget } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';
+import 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
+import 'vscode/vscode/vs/platform/actions/common/actions';
+import 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookOptions';
+import 'vscode/vscode/vs/base/browser/ui/toolbar/toolbar';
+import 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import 'vscode/vscode/vs/editor/contrib/gotoError/browser/gotoError';
+import 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import 'vscode/vscode/vs/base/common/resources';
+import 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
+import './interactiveEditor.css.js';
+import 'vscode/vscode/vs/editor/contrib/hover/browser/glyphHoverController';
+import 'vscode/vscode/vs/editor/contrib/hover/browser/contentHoverController';
+import './replEditorInput.js';
+import '../../interactive/browser/replInputHintContentWidget.js';
+
+function isReplEditorControl(control) {
+    const candidate = control;
+    return candidate?.activeCodeEditor instanceof CodeEditorWidget && candidate?.notebookEditor instanceof NotebookEditorWidget;
+}
+
+export { isReplEditorControl };

package/vscode/src/vs/workbench/contrib/replNotebook/browser/replEditorInput.js

@@ -0,0 +1,133 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
+import { IInteractiveHistoryService } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveHistoryService.service';
+import { NotebookSetting, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { INotebookEditorModelResolverService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
+import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
+import { ICustomEditorLabelService } from 'vscode/vscode/vs/workbench/services/editor/common/customEditorLabelService.service';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { localize } from 'vscode/vscode/vs/nls';
+import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
+
+var ReplEditorInput_1;
+const replTabIcon = registerIcon('repl-editor-label-icon', Codicon.debugLineByLine, ( localize(10250, 'Icon of the REPL editor label.')));
+let ReplEditorInput = class ReplEditorInput extends NotebookEditorInput {
+    static { ReplEditorInput_1 = this; }
+    static { this.ID = 'workbench.editorinputs.replEditorInput'; }
+    constructor(resource, label, _notebookService, _notebookModelResolverService, _fileDialogService, labelService, fileService, filesConfigurationService, extensionService, editorService, textResourceConfigurationService, customEditorLabelService, historyService, _textModelService, configurationService) {
+        super(resource, undefined, 'jupyter-notebook', {}, _notebookService, _notebookModelResolverService, _fileDialogService, labelService, fileService, filesConfigurationService, extensionService, editorService, textResourceConfigurationService, customEditorLabelService);
+        this.historyService = historyService;
+        this._textModelService = _textModelService;
+        this.isDisposing = false;
+        this.isScratchpad = resource.scheme === 'untitled' && configurationService.getValue(NotebookSetting.InteractiveWindowPromptToSave) !== true;
+        this.label = label ?? this.createEditorLabel(resource);
+    }
+    getIcon() {
+        return replTabIcon;
+    }
+    createEditorLabel(resource) {
+        if (!resource) {
+            return 'REPL';
+        }
+        if (resource.scheme === 'untitled') {
+            const match = ( (new RegExp('Untitled-(\\d+)\.'))).exec(resource.path);
+            if (match?.length === 2) {
+                return `REPL - ${match[1]}`;
+            }
+        }
+        const filename = resource.path.split('/').pop();
+        return filename ? `REPL - ${filename}` : 'REPL';
+    }
+    get typeId() {
+        return ReplEditorInput_1.ID;
+    }
+    get editorId() {
+        return 'repl';
+    }
+    getName() {
+        return this.label;
+    }
+    get editorInputs() {
+        return [this];
+    }
+    get capabilities() {
+        const capabilities = super.capabilities;
+        const scratchPad = this.isScratchpad ? 512  : 0;
+        return capabilities
+            | 2
+            | scratchPad;
+    }
+    async resolve() {
+        const model = await super.resolve();
+        if (model) {
+            await this.ensureInputBoxCell(model.notebook);
+        }
+        return model;
+    }
+    async ensureInputBoxCell(notebook) {
+        const lastCell = notebook.cells[notebook.cells.length - 1];
+        if (!lastCell || lastCell.cellKind === CellKind.Markup || lastCell.outputs.length > 0 || lastCell.internalMetadata.executionOrder !== undefined) {
+            notebook.applyEdits([
+                {
+                    editType: 1 ,
+                    index: notebook.cells.length,
+                    count: 0,
+                    cells: [
+                        {
+                            cellKind: CellKind.Code,
+                            language: 'python',
+                            mime: undefined,
+                            outputs: [],
+                            source: ''
+                        }
+                    ]
+                }
+            ], true, undefined, () => undefined, undefined, false);
+        }
+    }
+    async resolveInput(notebook) {
+        if (this.inputModelRef) {
+            return this.inputModelRef.object.textEditorModel;
+        }
+        const lastCell = notebook.cells[notebook.cells.length - 1];
+        if (!lastCell) {
+            throw ( (new Error('The REPL editor requires at least one cell for the input box.')));
+        }
+        this.inputModelRef = await this._textModelService.createModelReference(lastCell.uri);
+        return this.inputModelRef.object.textEditorModel;
+    }
+    dispose() {
+        if (!this.isDisposing) {
+            this.isDisposing = true;
+            this.editorModelReference?.object.revert({ soft: true });
+            this.inputModelRef?.dispose();
+            super.dispose();
+        }
+    }
+};
+ReplEditorInput = ReplEditorInput_1 = ( (__decorate([
+    ( (__param(2, INotebookService))),
+    ( (__param(3, INotebookEditorModelResolverService))),
+    ( (__param(4, IFileDialogService))),
+    ( (__param(5, ILabelService))),
+    ( (__param(6, IFileService))),
+    ( (__param(7, IFilesConfigurationService))),
+    ( (__param(8, IExtensionService))),
+    ( (__param(9, IEditorService))),
+    ( (__param(10, ITextResourceConfigurationService))),
+    ( (__param(11, ICustomEditorLabelService))),
+    ( (__param(12, IInteractiveHistoryService))),
+    ( (__param(13, ITextModelService))),
+    ( (__param(14, IConfigurationService)))
+], ReplEditorInput)));
+
+export { ReplEditorInput };