@codingame/monaco-vscode-editor-service-override 4.5.1 → 5.0.0

package/editor.js

@@ -12,9 +12,9 @@ import { DEFAULT_EDITOR_PART_OPTIONS } from 'vscode/vscode/vs/workbench/browser/
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { fakeActiveGroup, MonacoDelegateEditorGroupsService, MonacoEditorService } from './tools/editor.js';
 import { unsupported } from './tools.js';
-import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.autosave.contribution';
-import 'vscode/vscode/vs/workbench/contrib/files/browser/files.fileEditorFactory.contribution';
-import 'vscode/vscode/vs/workbench/contrib/files/browser/fileCommands.save';
+import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.contribution._autosave';
+import 'vscode/vscode/vs/workbench/contrib/files/browser/files.contribution._fileEditorFactory';
+import 'vscode/vscode/vs/workbench/contrib/files/browser/fileCommands._save';
 
 class EmptyEditorPart {
     constructor() {
@@ -68,6 +68,10 @@ class EmptyEditorPart {
 }
 class EmptyEditorGroupsService {
     constructor() {
+        this.saveWorkingSet = unsupported;
+        this.getWorkingSets = unsupported;
+        this.applyWorkingSet = unsupported;
+        this.deleteWorkingSet = unsupported;
         this.onDidCreateAuxiliaryEditorPart = Event.None;
         this.mainPart = new EmptyEditorPart();
         this.activePart = this.mainPart;
@@ -123,7 +127,7 @@ class EmptyEditorGroupsService {
 }
 let MonacoEditorGroupsService = class MonacoEditorGroupsService extends MonacoDelegateEditorGroupsService {
     constructor(instantiationService) {
-        super(instantiationService.createInstance(EmptyEditorGroupsService), instantiationService);
+        super(instantiationService.createInstance(EmptyEditorGroupsService), true, instantiationService);
     }
 };
 MonacoEditorGroupsService = __decorate([

package/package.json

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

package/tools/editor.js

@@ -421,7 +421,7 @@ StandaloneEditorGroup = StandaloneEditorGroup_1 = __decorate([
     ( __param(2, IContextKeyService))
 ], StandaloneEditorGroup);
 let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService extends Disposable {
-    constructor(delegate, instantiationService) {
+    constructor(delegate, emptyDelegate, instantiationService) {
         super();
         this.delegate = delegate;
         this._serviceBrand = undefined;
@@ -493,23 +493,34 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
             const handleCodeEditor = (editor) => {
                 if (editor instanceof StandaloneEditor) {
                     let timeout;
+                    const updateActiveGroup = (editor) => {
+                        const newActiveGroup = editor != null ? this.additionalGroups.find(group => group.editor === editor) : undefined;
+                        if (this.activeGroupOverride !== newActiveGroup) {
+                            this.activeGroupOverride = newActiveGroup;
+                            this._onDidChangeActiveGroup.fire(this.activeGroup);
+                        }
+                    };
+                    const remoteActiveGroup = (editor) => {
+                        if (!emptyDelegate && this.activeGroupOverride === this.additionalGroups.find(group => group.editor === editor)) {
+                            updateActiveGroup(undefined);
+                        }
+                    };
                     const onEditorFocused = () => {
                         if (timeout != null)
                             window.clearTimeout(timeout);
-                        this.activeGroupOverride = this.additionalGroups.find(group => group.editor === editor);
-                        this._onDidChangeActiveGroup.fire(this.activeGroup);
+                        updateActiveGroup(editor);
                     };
                     const onEditorBlurred = () => {
                         if (timeout != null)
                             window.clearTimeout(timeout);
                         timeout = window.setTimeout(() => {
                             timeout = undefined;
-                            if (this.activeGroupOverride === this.additionalGroups.find(group => group.editor === editor)) {
-                                this.activeGroupOverride = undefined;
-                                this._onDidChangeActiveGroup.fire(this.activeGroup);
-                            }
+                            remoteActiveGroup(editor);
                         }, 100);
                     };
+                    editor.onDidDispose(() => {
+                        remoteActiveGroup(editor);
+                    });
                     editor.onDidFocusEditorText(onEditorFocused);
                     editor.onDidFocusEditorWidget(onEditorFocused);
                     editor.onDidBlurEditorText(onEditorBlurred);
@@ -541,6 +552,18 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
             codeEditorService.listCodeEditors().forEach(handleCodeEditor);
         });
     }
+    saveWorkingSet(name) {
+        return this.delegate.saveWorkingSet(name);
+    }
+    getWorkingSets() {
+        return this.delegate.getWorkingSets();
+    }
+    applyWorkingSet(workingSet) {
+        return this.delegate.applyWorkingSet(workingSet);
+    }
+    deleteWorkingSet(workingSet) {
+        return this.delegate.deleteWorkingSet(workingSet);
+    }
     get isReady() {
         return this.delegate.isReady;
     }
@@ -582,7 +605,7 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
     get partOptions() { return this.delegate.partOptions; }
 };
 MonacoDelegateEditorGroupsService = __decorate([
-    ( __param(1, IInstantiationService))
+    ( __param(2, IInstantiationService))
 ], MonacoDelegateEditorGroupsService);
 
 export { MonacoDelegateEditorGroupsService, MonacoEditorService, fakeActiveGroup, wrapOpenEditor };