@codingame/monaco-vscode-interactive-service-override 2.2.2 → 3.0.0

package/package.json

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

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

@@ -5,7 +5,6 @@ import { parse } from 'vscode/vscode/vs/base/common/marshalling';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { extname, isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { isFalsyOrWhitespace } from 'vscode/vscode/vs/base/common/strings';
-import { assertType } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
@@ -14,10 +13,10 @@ import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { peekViewBorder } from 'vscode/vscode/vs/editor/contrib/peekView/browser/peekView';
 import { Context } from 'vscode/vscode/vs/editor/contrib/suggest/browser/suggest';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 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';
@@ -26,7 +25,7 @@ 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 { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+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';
@@ -37,7 +36,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';
-import { INTERACTIVE_WINDOW_EDITOR_ID, CellKind, CellUri, NotebookWorkingCopyTypeIdentifier } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { INTERACTIVE_WINDOW_EDITOR_ID, CellUri, NotebookWorkingCopyTypeIdentifier, CellKind } 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';
@@ -48,15 +47,16 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService';
 
-const interactiveWindowCategory = { value: ( localizeWithPath(
+const interactiveWindowCategory = ( localize2WithPath(
     'vs/workbench/contrib/interactive/browser/interactive.contribution',
     'interactiveWindow',
-    'Interactive Window'
-)), original: 'Interactive Window' };
+    "Interactive Window"
+));
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(InteractiveEditor, INTERACTIVE_WINDOW_EDITOR_ID, 'Interactive Window'), [
     ( new SyncDescriptor(InteractiveEditorInput))
 ]);
 let InteractiveDocumentContribution = class InteractiveDocumentContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.interactiveDocument'; }
     constructor(notebookService, editorResolverService, editorService, instantiationService) {
         super();
         this.instantiationService = instantiationService;
@@ -132,6 +132,7 @@ InteractiveDocumentContribution = ( __decorate([
     ( __param(3, IInstantiationService))
 ], InteractiveDocumentContribution));
 let InteractiveInputContentProvider = class InteractiveInputContentProvider {
+    static { this.ID = 'workbench.contrib.interactiveInputContentProvider'; }
     constructor(textModelService, _modelService) {
         this._modelService = _modelService;
         this._registration = textModelService.registerTextModelContentProvider(Schemas.vscodeInteractiveInput, this);
@@ -160,6 +161,7 @@ function createEditor(resource, instantiationService) {
     return editorInput;
 }
 let InteractiveWindowWorkingCopyEditorHandler = class InteractiveWindowWorkingCopyEditorHandler extends Disposable {
+    static { this.ID = 'workbench.contrib.interactiveWindowWorkingCopyEditorHandler'; }
     constructor(_instantiationService, _workingCopyEditorService, _extensionService) {
         super();
         this._instantiationService = _instantiationService;
@@ -193,18 +195,21 @@ InteractiveWindowWorkingCopyEditorHandler = ( __decorate([
     ( __param(1, IWorkingCopyEditorService)),
     ( __param(2, IExtensionService))
 ], InteractiveWindowWorkingCopyEditorHandler));
-const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
-workbenchContributionsRegistry.registerWorkbenchContribution(InteractiveDocumentContribution, 2 );
-workbenchContributionsRegistry.registerWorkbenchContribution(InteractiveInputContentProvider, 2 );
-workbenchContributionsRegistry.registerWorkbenchContribution(InteractiveWindowWorkingCopyEditorHandler, 2 );
+registerWorkbenchContribution2(InteractiveDocumentContribution.ID, InteractiveDocumentContribution, 2 );
+registerWorkbenchContribution2(InteractiveInputContentProvider.ID, InteractiveInputContentProvider, 2 );
+registerWorkbenchContribution2(InteractiveWindowWorkingCopyEditorHandler.ID, InteractiveWindowWorkingCopyEditorHandler, 2 );
 class InteractiveEditorSerializer {
     static { this.ID = InteractiveEditorInput.ID; }
     canSerialize(editor) {
-        const interactiveEditorInput = editor;
-        return URI.isUri(interactiveEditorInput?.primary?.resource) && URI.isUri(interactiveEditorInput?.inputResource);
+        if (!(editor instanceof InteractiveEditorInput)) {
+            return false;
+        }
+        return URI.isUri(editor.primary.resource) && URI.isUri(editor.inputResource);
     }
     serialize(input) {
-        assertType(input instanceof InteractiveEditorInput);
+        if (!this.canSerialize(input)) {
+            return undefined;
+        }
         return JSON.stringify({
             resource: input.primary.resource,
             inputResource: input.inputResource,
@@ -683,7 +688,7 @@ registerColor('interactive.inactiveCodeBorder', {
     'interactive.inactiveCodeBorder',
     'The border color for the current interactive code cell when the editor does not have focus.'
 )));
-( Registry.as(Extensions$1.Configuration)).registerConfiguration({
+( Registry.as(Extensions.Configuration)).registerConfiguration({
     id: 'interactiveWindow',
     order: 100,
     type: 'object',

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/interactive.css.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { append, $, createStyleSheet, getWindow, Dimension } from 'vscode/vscode/vs/base/browser/dom';
+import { getWindowById, append, $, createStyleSheet, getWindow, 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 { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
@@ -85,8 +85,10 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
             }
         }));
         this._notebookOptions = ( new NotebookOptions(
+            getWindowById(this.group?.windowId, true).window ?? mainWindow,
             configurationService,
             notebookExecutionStateService,
+            codeEditorService,
             true,
             { cellToolbarInteraction: 'hover', globalToolbar: true, stickyScrollEnabled: false, dragAndDropEnabled: false }
         ));
@@ -125,8 +127,8 @@ let InteractiveEditor = class InteractiveEditor extends EditorPane {
         const menu = this._register(this._menuService.createMenu(MenuId.InteractiveInputExecute, this._contextKeyService));
         this._runbuttonToolbar = this._register(( new ToolBar(runButtonContainer, this._contextMenuService, {
             getKeyBinding: action => this._keybindingService.lookupKeybinding(action.id),
-            actionViewItemProvider: action => {
-                return createActionViewItem(this._instantiationService, action);
+            actionViewItemProvider: (action, options) => {
+                return createActionViewItem(this._instantiationService, action, options);
             },
             renderDropdownAsChildElement: true
         })));