@codingame/monaco-vscode-interactive-service-override 3.2.2 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-interactive-service-override",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
   }
 }

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

@@ -23,20 +23,31 @@ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/d
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { registerColor, ifDefinedThenElse, contrastBorder, listInactiveSelectionBackground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { registerColor, ifDefinedThenElse } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import { contrastBorder } from '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 { listInactiveSelectionBackground } from '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 { 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 { 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 'vscode/vscode/vs/base/common/event';
 import { InteractiveEditor } from './interactiveEditor.js';
 import { InteractiveEditorInput } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
 import { IInteractiveHistoryService } from 'vscode/vscode/vs/workbench/contrib/interactive/browser/interactiveHistoryService';
 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';
-import { INTERACTIVE_WINDOW_EDITOR_ID, CellUri, NotebookWorkingCopyTypeIdentifier, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { INTERACTIVE_WINDOW_EDITOR_ID, CellUri, NotebookWorkingCopyTypeIdentifier, 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';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
@@ -196,8 +207,12 @@ InteractiveWindowWorkingCopyEditorHandler = ( __decorate([
     ( __param(2, IExtensionService))
 ], InteractiveWindowWorkingCopyEditorHandler));
 registerWorkbenchContribution2(InteractiveDocumentContribution.ID, InteractiveDocumentContribution, 2 );
-registerWorkbenchContribution2(InteractiveInputContentProvider.ID, InteractiveInputContentProvider, 2 );
-registerWorkbenchContribution2(InteractiveWindowWorkingCopyEditorHandler.ID, InteractiveWindowWorkingCopyEditorHandler, 2 );
+registerWorkbenchContribution2(InteractiveInputContentProvider.ID, InteractiveInputContentProvider, {
+    editorTypeId: INTERACTIVE_WINDOW_EDITOR_ID
+});
+registerWorkbenchContribution2(InteractiveWindowWorkingCopyEditorHandler.ID, InteractiveWindowWorkingCopyEditorHandler, {
+    editorTypeId: INTERACTIVE_WINDOW_EDITOR_ID
+});
 class InteractiveEditorSerializer {
     static { this.ID = InteractiveEditorInput.ID; }
     canSerialize(editor) {
@@ -704,5 +719,21 @@ registerColor('interactive.inactiveCodeBorder', {
         }
     }
 });
+( Registry.as(Extensions.Configuration)).registerConfiguration({
+    id: 'interactiveWindow',
+    order: 100,
+    type: 'object',
+    'properties': {
+        [NotebookSetting.InteractiveWindowPromptToSave]: {
+            type: 'boolean',
+            default: false,
+            markdownDescription: ( localizeWithPath(
+                'vs/workbench/contrib/interactive/browser/interactive.contribution',
+                'interactiveWindow.promptToSaveOnClose',
+                "Prompt to save the interactive window when it is closed. Only new interactive windows will be affected by this setting change."
+            ))
+        }
+    }
+});
 
 export { InteractiveDocumentContribution, InteractiveEditorSerializer };

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

@@ -1,16 +1,26 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/interactive.css.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { getWindowById, append, $, createStyleSheet, getWindow, Dimension } from 'vscode/vscode/vs/base/browser/dom';
+import { append, $, createStyleSheet, Dimension } from 'vscode/vscode/vs/base/browser/dom';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+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/codeEditorWidget';
+import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { resolveColorValue, editorForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { resolveColorValue } from '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 { editorForeground } from '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 { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { getSimpleEditorOptions } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
@@ -49,7 +59,6 @@ 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 { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 
 const DECORATION_KEY = 'interactiveInputDecoration';
 const INTERACTIVE_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'InteractiveEditorViewState';
@@ -58,14 +67,16 @@ const INPUT_CELL_HORIZONTAL_PADDING_RIGHT = 10;
 const INPUT_EDITOR_PADDING = 8;
 let InteractiveEditor = class InteractiveEditor extends EditorPane {
     get onDidFocus() { return this._onDidFocusWidget.event; }
-    constructor(telemetryService, themeService, storageService, instantiationService, notebookWidgetService, contextKeyService, codeEditorService, notebookKernelService, languageService, keybindingService, configurationService, menuService, contextMenuService, editorGroupService, textResourceConfigurationService, notebookExecutionStateService, extensionService) {
-        super(INTERACTIVE_WINDOW_EDITOR_ID, telemetryService, themeService, storageService);
+    constructor(group, telemetryService, themeService, storageService, instantiationService, notebookWidgetService, contextKeyService, codeEditorService, notebookKernelService, languageService, keybindingService, configurationService, menuService, contextMenuService, editorGroupService, textResourceConfigurationService, notebookExecutionStateService, extensionService) {
+        super(INTERACTIVE_WINDOW_EDITOR_ID, group, telemetryService, themeService, storageService);
         this._notebookWidget = { value: undefined };
         this._widgetDisposableStore = this._register(( new DisposableStore()));
-        this._groupListener = this._register(( new DisposableStore()));
+        this._groupListener = this._register(( new MutableDisposable()));
         this._onDidFocusWidget = this._register(( new Emitter()));
         this._onDidChangeSelection = this._register(( new Emitter()));
         this.onDidChangeSelection = this._onDidChangeSelection.event;
+        this._onDidChangeScroll = this._register(( new Emitter()));
+        this.onDidChangeScroll = this._onDidChangeScroll.event;
         this._instantiationService = instantiationService;
         this._notebookWidgetService = notebookWidgetService;
         this._contextKeyService = contextKeyService;
@@ -85,7 +96,7 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
             }
         }));
         this._notebookOptions = ( new NotebookOptions(
-            getWindowById(this.group?.windowId, true).window ?? mainWindow,
+            this.window,
             configurationService,
             notebookExecutionStateService,
             codeEditorService,
@@ -221,7 +232,7 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
         return this._loadNotebookEditorViewState(input);
     }
     _saveEditorViewState(input) {
-        if (this.group && this._notebookWidget.value && input instanceof InteractiveEditorInput) {
+        if (this._notebookWidget.value && input instanceof InteractiveEditorInput) {
             if (this._notebookWidget.value.isDisposed) {
                 return;
             }
@@ -234,10 +245,7 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
         }
     }
     _loadNotebookEditorViewState(input) {
-        let result;
-        if (this.group) {
-            result = this._editorMemento.loadEditorState(this.group, input.notebookEditorInput.resource);
-        }
+        const result = this._editorMemento.loadEditorState(this.group, input.notebookEditorInput.resource);
         if (result) {
             return result;
         }
@@ -254,12 +262,11 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
         return;
     }
     async setInput(input, options, context, token) {
-        const group = this.group;
         const notebookInput = input.notebookEditorInput;
         this._notebookWidget.value?.onWillHide();
         this._codeEditorWidget?.dispose();
         this._widgetDisposableStore.clear();
-        this._notebookWidget = this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, group, notebookInput, {
+        this._notebookWidget = this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, this.group, notebookInput, {
             isEmbedded: true,
             isReadOnly: true,
             contributions: NotebookEditorExtensionsRegistry.getSomeEditorContributions([
@@ -282,8 +289,9 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
                 HoverController.ID,
                 MarkerController.ID
             ]),
-            options: this._notebookOptions
-        }, undefined, this._rootElement ? getWindow(this._rootElement) : mainWindow);
+            options: this._notebookOptions,
+            codeWindow: this.window
+        }, undefined, this.window);
         this._codeEditorWidget = this._instantiationService.createInstance(CodeEditorWidget, this._inputEditorContainer, this._editorOptions, {
             ...{
                 isSimpleWidget: false,
@@ -411,6 +419,7 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
                 this.input.historyService.replaceLast(this.input.resource, value);
             }
         }));
+        this._widgetDisposableStore.add(this._notebookWidget.value.onDidScroll(() => this._onDidChangeScroll.fire()));
         this._syncWithKernel();
     }
     setOptions(options) {
@@ -526,6 +535,15 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
         }
         this._codeEditorWidget.setDecorationsByType('interactive-decoration', DECORATION_KEY, decorations);
     }
+    getScrollPosition() {
+        return {
+            scrollTop: this._notebookWidget.value?.scrollTop ?? 0,
+            scrollLeft: 0
+        };
+    }
+    setScrollPosition(position) {
+        this._notebookWidget.value?.setScrollTop(position.scrollTop);
+    }
     focus() {
         super.focus();
         this._notebookWidget.value?.onShow();
@@ -534,12 +552,9 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
     focusHistory() {
         this._notebookWidget.value.focus();
     }
-    setEditorVisible(visible, group) {
-        super.setEditorVisible(visible, group);
-        if (group) {
-            this._groupListener.clear();
-            this._groupListener.add(group.onWillCloseEditor(e => this._saveEditorViewState(e.editor)));
-        }
+    setEditorVisible(visible) {
+        super.setEditorVisible(visible);
+        this._groupListener.value = this.group.onWillCloseEditor(e => this._saveEditorViewState(e.editor));
         if (!visible) {
             this._saveEditorViewState(this.input);
             if (this.input && this._notebookWidget.value) {
@@ -565,23 +580,23 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
     }
 };
 InteractiveEditor = ( __decorate([
-    ( __param(0, ITelemetryService)),
-    ( __param(1, IThemeService)),
-    ( __param(2, IStorageService)),
-    ( __param(3, IInstantiationService)),
-    ( __param(4, INotebookEditorService)),
-    ( __param(5, IContextKeyService)),
-    ( __param(6, ICodeEditorService)),
-    ( __param(7, INotebookKernelService)),
-    ( __param(8, ILanguageService)),
-    ( __param(9, IKeybindingService)),
-    ( __param(10, IConfigurationService)),
-    ( __param(11, IMenuService)),
-    ( __param(12, IContextMenuService)),
-    ( __param(13, IEditorGroupsService)),
-    ( __param(14, ITextResourceConfigurationService)),
-    ( __param(15, INotebookExecutionStateService)),
-    ( __param(16, IExtensionService))
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IThemeService)),
+    ( __param(3, IStorageService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, INotebookEditorService)),
+    ( __param(6, IContextKeyService)),
+    ( __param(7, ICodeEditorService)),
+    ( __param(8, INotebookKernelService)),
+    ( __param(9, ILanguageService)),
+    ( __param(10, IKeybindingService)),
+    ( __param(11, IConfigurationService)),
+    ( __param(12, IMenuService)),
+    ( __param(13, IContextMenuService)),
+    ( __param(14, IEditorGroupsService)),
+    ( __param(15, ITextResourceConfigurationService)),
+    ( __param(16, INotebookExecutionStateService)),
+    ( __param(17, IExtensionService))
 ], InteractiveEditor));
 
 export { InteractiveEditor };