@codingame/monaco-vscode-editor-service-override 1.83.16 → 1.85.0-next.1

package/editor.js

@@ -12,12 +12,14 @@ import { FILE_EDITOR_INPUT_ID } from 'vscode/vscode/vs/workbench/contrib/files/c
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { DEFAULT_EDITOR_PART_OPTIONS } from 'vscode/vscode/vs/workbench/browser/parts/editor/editor';
 import { MonacoEditorService, MonacoDelegateEditorGroupsService } from './tools/editor.js';
 import { unsupported } from './tools.js';
 import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.contribution';
 
 class EmptyEditorGroup {
     constructor() {
+        this.createEditorActions = unsupported;
         this.onDidFocus = Event.None;
         this.onDidOpenEditorFail = Event.None;
         this.whenRestored = Promise.resolve();
@@ -77,6 +79,10 @@ class EmptyEditorGroup {
         this.isFirst = unsupported;
         this.isLast = unsupported;
     }
+    get groupsView() {
+        return unsupported();
+    }
+    notifyLabelChanged() { }
     get titleHeight() {
         return unsupported();
     }
@@ -88,8 +94,67 @@ class EmptyEditorGroup {
     }
 }
 const fakeActiveGroup = new EmptyEditorGroup();
+class EmptyEditorPart {
+    constructor() {
+        this.onDidLayout = Event.None;
+        this.onDidScroll = Event.None;
+        this.isReady = true;
+        this.whenReady = Promise.resolve();
+        this.whenRestored = Promise.resolve();
+        this.hasRestorableState = false;
+        this.centerLayout = unsupported;
+        this.isLayoutCentered = unsupported;
+        this.enforcePartOptions = unsupported;
+        this.onDidChangeActiveGroup = Event.None;
+        this.onDidAddGroup = Event.None;
+        this.onDidRemoveGroup = Event.None;
+        this.onDidMoveGroup = Event.None;
+        this.onDidActivateGroup = Event.None;
+        this.onDidChangeGroupIndex = Event.None;
+        this.onDidChangeGroupLocked = Event.None;
+        this.onDidChangeGroupMaximized = Event.None;
+        this.activeGroup = fakeActiveGroup;
+        this.groups = [fakeActiveGroup];
+        this.count = 0;
+        this.orientation = 0 ;
+        this.getGroups = () => [];
+        this.getGroup = () => undefined;
+        this.activateGroup = unsupported;
+        this.getSize = unsupported;
+        this.setSize = unsupported;
+        this.arrangeGroups = unsupported;
+        this.toggleMaximizeGroup = unsupported;
+        this.toggleExpandGroup = unsupported;
+        this.applyLayout = unsupported;
+        this.getLayout = unsupported;
+        this.setGroupOrientation = unsupported;
+        this.findGroup = () => undefined;
+        this.addGroup = unsupported;
+        this.removeGroup = unsupported;
+        this.moveGroup = unsupported;
+        this.mergeGroup = unsupported;
+        this.mergeAllGroups = unsupported;
+        this.copyGroup = unsupported;
+        this.partOptions = DEFAULT_EDITOR_PART_OPTIONS;
+        this.onDidChangeEditorPartOptions = Event.None;
+        this.createEditorDropTarget = unsupported;
+    }
+    get contentDimension() { return unsupported(); }
+    get sideGroup() { return unsupported(); }
+}
 class EmptyEditorGroupsService {
     constructor() {
+        this.onDidCreateAuxiliaryEditorPart = Event.None;
+        this.mainPart = new EmptyEditorPart();
+        this.activePart = this.mainPart;
+        this.parts = [this.mainPart];
+        this.getPart = unsupported;
+        this.createAuxiliaryEditorPart = unsupported;
+        this.onDidChangeGroupMaximized = Event.None;
+        this.toggleMaximizeGroup = unsupported;
+        this.toggleExpandGroup = unsupported;
+        this.partOptions = DEFAULT_EDITOR_PART_OPTIONS;
+        this.createEditorDropTarget = unsupported;
         this._serviceBrand = undefined;
         this.getLayout = unsupported;
         this.onDidChangeActiveGroup = Event.None;
@@ -126,7 +191,6 @@ class EmptyEditorGroupsService {
         this.mergeGroup = unsupported;
         this.mergeAllGroups = unsupported;
         this.copyGroup = unsupported;
-        this.partOptions = {};
         this.onDidChangeEditorPartOptions = Event.None;
         this.enforcePartOptions = unsupported;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-editor-service-override",
-  "version": "1.83.16",
+  "version": "1.85.0-next.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.16",
-    "monaco-editor": "0.44.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.1",
+    "monaco-editor": "0.45.0"
   }
 }

package/tools/editor.d.ts

@@ -1,21 +1,21 @@
 import { IEditorPane, IUntypedEditorInput, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, ITextDiffEditorPane } from 'vscode/vscode/vs/workbench/common/editor';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
+import { PreferredGroup } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
+import { IEditorOptions, IResourceEditorInput, ITextResourceEditorInput } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { ICodeEditor, IDiffEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IReference } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IEditorOptions, IResourceEditorInput, ITextResourceEditorInput } from 'vscode/vscode/vs/platform/editor/common/editor';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
-import { IResolvedTextEditorModel, ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import { PreferredGroup } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
+import { IResolvedTextEditorModel, ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { EditorService } from 'vscode/vscode/vs/workbench/services/editor/browser/editorService';
+import { IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { ITextEditorService } from 'vscode/vscode/vs/workbench/services/textfile/common/textEditorService';
-import { IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
-import { EditorService } from 'vscode/vscode/vs/workbench/services/editor/browser/editorService';
 
 type OpenEditor = (modelRef: IReference<IResolvedTextEditorModel>, options: IEditorOptions | undefined, sideBySide?: boolean) => Promise<ICodeEditor | undefined>;
 declare class MonacoEditorService extends EditorService {

package/tools/editor.js

@@ -89,7 +89,7 @@ function wrapOpenEditor(textModelService, defaultBehavior, fallbackBahavior) {
 }
 let MonacoEditorService = class MonacoEditorService extends EditorService {
     constructor(_openEditorFallback, _isEditorPartVisible, _editorGroupService, instantiationService, fileService, configurationService, contextService, uriIdentityService, editorResolverService, workspaceTrustRequestService, hostService, textEditorService, textModelService) {
-        super(_editorGroupService, instantiationService, fileService, configurationService, contextService, uriIdentityService, editorResolverService, workspaceTrustRequestService, hostService, textEditorService);
+        super(undefined, _editorGroupService, instantiationService, fileService, configurationService, contextService, uriIdentityService, editorResolverService, workspaceTrustRequestService, hostService, textEditorService);
         this._isEditorPartVisible = _isEditorPartVisible;
         this.openEditor = wrapOpenEditor(textModelService, this.openEditor.bind(this), _openEditorFallback);
     }
@@ -229,7 +229,7 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
             });
             this.pane = new StandaloneEditorPane(editor, editorInput, this);
             this._onDidModelChange.fire({
-                kind: 3 ,
+                kind: 4 ,
                 editor: editorInput,
                 editorIndex: 0
             });
@@ -242,7 +242,7 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
                 const pane = this.pane;
                 this.pane = undefined;
                 this._onDidModelChange.fire({
-                    kind: 4 ,
+                    kind: 5 ,
                     editorIndex: 0
                 });
                 this._onDidActiveEditorChange.fire({
@@ -279,6 +279,19 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
             this.pane = new StandaloneEditorPane(editor, editorInput, this);
         }
     }
+    get groupsView() {
+        return unsupported();
+    }
+    notifyLabelChanged() { }
+    createEditorActions() {
+        return {
+            actions: {
+                primary: [],
+                secondary: []
+            },
+            onDidChange: Event.None
+        };
+    }
     get titleHeight() { return unsupported(); }
     setActive(isActive) {
         this.active = isActive;
@@ -315,6 +328,8 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         this._serviceBrand = undefined;
         this.additionalGroups = [];
         this.activeGroupOverride = undefined;
+        this.onDidCreateAuxiliaryEditorPart = this.delegate.onDidCreateAuxiliaryEditorPart;
+        this.onDidChangeGroupMaximized = this.delegate.onDidChangeGroupMaximized;
         this._onDidChangeActiveGroup = new Emitter();
         this.onDidChangeActiveGroup = Event.any(this._onDidChangeActiveGroup.event, this.delegate.onDidChangeActiveGroup);
         this._onDidAddGroup = new Emitter();
@@ -323,8 +338,6 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         this.onDidRemoveGroup = Event.any(this._onDidRemoveGroup.event, this.delegate.onDidRemoveGroup);
         this.onDidMoveGroup = this.delegate.onDidMoveGroup;
         this.onDidActivateGroup = this.delegate.onDidActivateGroup;
-        this.onDidLayout = this.delegate.onDidLayout;
-        this.onDidScroll = this.delegate.onDidScroll;
         this.onDidChangeGroupIndex = this.delegate.onDidChangeGroupIndex;
         this.onDidChangeGroupLocked = this.delegate.onDidChangeGroupLocked;
         this.getLayout = () => {
@@ -351,12 +364,6 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         this.applyLayout = (...args) => {
             return this.delegate.applyLayout(...args);
         };
-        this.centerLayout = (...args) => {
-            return this.delegate.centerLayout(...args);
-        };
-        this.isLayoutCentered = (...args) => {
-            return this.delegate.isLayoutCentered(...args);
-        };
         this.setGroupOrientation = (...args) => {
             return this.delegate.setGroupOrientation(...args);
         };
@@ -381,9 +388,6 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         this.copyGroup = (...args) => {
             return this.delegate.copyGroup(...args);
         };
-        this.enforcePartOptions = (...args) => {
-            return this.delegate.enforcePartOptions(...args);
-        };
         this.onDidChangeEditorPartOptions = this.delegate.onDidChangeEditorPartOptions;
         setTimeout(() => {
             const codeEditorService = StandaloneServices.get(ICodeEditorService);
@@ -393,8 +397,16 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
                         this.activeGroupOverride = this.additionalGroups.find(group => group.editor === editor);
                         this._onDidChangeActiveGroup.fire(this.activeGroup);
                     };
+                    const onEditorBlurred = () => {
+                        if (this.activeGroupOverride === this.additionalGroups.find(group => group.editor === editor)) {
+                            this.activeGroupOverride = undefined;
+                            this._onDidChangeActiveGroup.fire(this.activeGroup);
+                        }
+                    };
                     editor.onDidFocusEditorText(onEditorFocused);
                     editor.onDidFocusEditorWidget(onEditorFocused);
+                    editor.onDidBlurEditorText(onEditorBlurred);
+                    editor.onDidBlurEditorWidget(onEditorBlurred);
                     if (editor.hasWidgetFocus()) {
                         onEditorFocused();
                     }
@@ -422,20 +434,33 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
             codeEditorService.listCodeEditors().forEach(handleCodeEditor);
         });
     }
+    get parts() { return this.delegate.parts; }
+    createAuxiliaryEditorPart(options) {
+        return this.delegate.createAuxiliaryEditorPart(options);
+    }
+    get mainPart() { return this.delegate.mainPart; }
+    get activePart() { return this.delegate.activePart; }
+    getPart(container) {
+        return this.delegate.getPart(container);
+    }
+    toggleMaximizeGroup(group) {
+        return this.delegate.toggleMaximizeGroup(group);
+    }
+    toggleExpandGroup(group) {
+        return this.delegate.toggleExpandGroup(group);
+    }
+    createEditorDropTarget(container, delegate) {
+        return this.delegate.createEditorDropTarget(container, delegate);
+    }
     get groups() {
         return [...this.additionalGroups, ...this.delegate.groups];
     }
     get activeGroup() {
         return this.activeGroupOverride ?? this.delegate.activeGroup;
     }
-    get contentDimension() { return this.delegate.contentDimension; }
     get sideGroup() { return this.delegate.sideGroup; }
     get count() { return this.delegate.count + this.additionalGroups.length; }
     get orientation() { return this.delegate.orientation; }
-    get isReady() { return this.delegate.isReady; }
-    get whenReady() { return this.delegate.whenReady; }
-    get whenRestored() { return this.delegate.whenRestored; }
-    get hasRestorableState() { return this.delegate.hasRestorableState; }
     get partOptions() { return this.delegate.partOptions; }
 };
 MonacoDelegateEditorGroupsService = __decorate([