@codingame/monaco-vscode-views-service-override 4.5.2 → 5.0.0

package/index.js

@@ -4,7 +4,6 @@ export { ActivitybarPart } from '@codingame/monaco-vscode-view-common-service-ov
 export { GroupOrientation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 export { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
 export { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService/hoverService';
 export { EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
 export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-views-service-override",
-  "version": "4.5.2",
+  "version": "5.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,9 +26,9 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.5.2",
-    "@codingame/monaco-vscode-quickaccess-service-override": "4.5.2",
-    "@codingame/monaco-vscode-keybindings-service-override": "4.5.2",
-    "@codingame/monaco-vscode-view-common-service-override": "4.5.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@5.0.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "5.0.0",
+    "@codingame/monaco-vscode-keybindings-service-override": "5.0.0",
+    "@codingame/monaco-vscode-view-common-service-override": "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 };

package/tools/views.js

@@ -34,12 +34,11 @@ export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layout
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
 export { SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
-import { fakeActiveGroup } from './editor.js';
 import { withReadyServices } from 'vscode/services';
 
 class InjectedEditorPane extends EditorPane {
-    constructor(id) {
-        super(id, fakeActiveGroup, StandaloneServices.get(ITelemetryService), StandaloneServices.get(IThemeService), StandaloneServices.get(IStorageService));
+    constructor(id, group) {
+        super(id, group, StandaloneServices.get(ITelemetryService), StandaloneServices.get(IThemeService), StandaloneServices.get(IStorageService));
     }
 }
 class SimpleEditorPane extends InjectedEditorPane {

package/views.js

@@ -35,7 +35,6 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service';
 import { EditorParts } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/editor/editorParts';
-export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService/hoverService';
 import { MonacoDelegateEditorGroupsService, MonacoEditorService } from './tools/editor.js';
 import getServiceOverride$2 from '@codingame/monaco-vscode-quickaccess-service-override';
 import getServiceOverride$3 from '@codingame/monaco-vscode-keybindings-service-override';
@@ -144,7 +143,7 @@ function isEditorPartVisible() {
 }
 let MonacoEditorParts = class MonacoEditorParts extends MonacoDelegateEditorGroupsService {
     constructor(instantiationService) {
-        super(instantiationService.createInstance(EditorParts), instantiationService);
+        super(instantiationService.createInstance(EditorParts), false, instantiationService);
         this.restoreGroup = (...args) => {
             return this.delegate.restoreGroup(...args);
         };