@codingame/monaco-vscode-api 1.83.16 → 1.85.0-next.1

package/vscode/src/vs/workbench/services/editor/browser/editorService.js

@@ -26,8 +26,9 @@ import { IWorkspaceTrustRequestService } from 'monaco-editor/esm/vs/platform/wor
 import { IHostService } from '../../host/browser/host.js';
 import { findGroup } from '../common/editorGroupFinder.js';
 import { ITextEditorService } from '../../textfile/common/textEditorService.js';
-let EditorService = class EditorService extends Disposable {
-    constructor(editorGroupService, instantiationService, fileService, configurationService, contextService, uriIdentityService, editorResolverService, workspaceTrustRequestService, hostService, textEditorService) {
+var EditorService_1;
+let EditorService = EditorService_1 = class EditorService extends Disposable {
+    constructor(editorGroupsContainer, editorGroupService, instantiationService, fileService, configurationService, contextService, uriIdentityService, editorResolverService, workspaceTrustRequestService, hostService, textEditorService) {
         super();
         this.editorGroupService = editorGroupService;
         this.instantiationService = instantiationService;
@@ -54,14 +55,35 @@ let EditorService = class EditorService extends Disposable {
         this.lastActiveEditor = undefined;
         this.activeOutOfWorkspaceWatchers = ( new ResourceMap());
         this.closeOnFileDelete = false;
-        this.editorsObserver = this._register(this.instantiationService.createInstance(EditorsObserver));
+        this.editorGroupsContainer = editorGroupsContainer ?? editorGroupService;
+        this.editorsObserver = this._register(this.instantiationService.createInstance(EditorsObserver, this.editorGroupsContainer));
         this.onConfigurationUpdated();
         this.registerListeners();
     }
+    createScoped(editorGroupsContainer, disposables) {
+        return disposables.add(( new EditorService_1(
+            editorGroupsContainer === 'main' ? this.editorGroupService.mainPart : editorGroupsContainer,
+            this.editorGroupService,
+            this.instantiationService,
+            this.fileService,
+            this.configurationService,
+            this.contextService,
+            this.uriIdentityService,
+            this.editorResolverService,
+            this.workspaceTrustRequestService,
+            this.hostService,
+            this.textEditorService
+        )));
+    }
     registerListeners() {
-        this.editorGroupService.whenReady.then(() => this.onEditorGroupsReady());
-        this._register(this.editorGroupService.onDidChangeActiveGroup(group => this.handleActiveEditorChange(group)));
-        this._register(this.editorGroupService.onDidAddGroup(group => this.registerGroupListeners(group)));
+        if (this.editorGroupsContainer === this.editorGroupService.mainPart || this.editorGroupsContainer === this.editorGroupService) {
+            this.editorGroupService.mainPart.whenReady.then(() => this.onEditorGroupsReady());
+        }
+        else {
+            this.onEditorGroupsReady();
+        }
+        this._register(this.editorGroupsContainer.onDidChangeActiveGroup(group => this.handleActiveEditorChange(group)));
+        this._register(this.editorGroupsContainer.onDidAddGroup(group => this.registerGroupListeners(group)));
         this._register(this.editorsObserver.onDidMostRecentlyActiveEditorsChange(() => this._onDidMostRecentlyActiveEditorsChange.fire()));
         this._register(this.onDidVisibleEditorsChange(() => this.handleVisibleEditorsChange()));
         this._register(this.fileService.onDidRunOperation(e => this.onDidRunFileOperation(e)));
@@ -69,7 +91,7 @@ let EditorService = class EditorService extends Disposable {
         this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e)));
     }
     onEditorGroupsReady() {
-        for (const group of this.editorGroupService.groups) {
+        for (const group of this.editorGroupsContainer.groups) {
             this.registerGroupListeners(group);
         }
         if (this.activeEditor) {
@@ -78,7 +100,7 @@ let EditorService = class EditorService extends Disposable {
         }
     }
     handleActiveEditorChange(group) {
-        if (group !== this.editorGroupService.activeGroup) {
+        if (group !== this.editorGroupsContainer.activeGroup) {
             return;
         }
         if (!this.lastActiveEditor && !group.activeEditor) {
@@ -87,7 +109,7 @@ let EditorService = class EditorService extends Disposable {
         this.doHandleActiveEditorChangeEvent();
     }
     doHandleActiveEditorChangeEvent() {
-        const activeGroup = this.editorGroupService.activeGroup;
+        const activeGroup = this.editorGroupsContainer.activeGroup;
         this.lastActiveEditor = activeGroup.activeEditor ?? undefined;
         this._onDidActiveEditorChange.fire();
     }
@@ -150,7 +172,7 @@ let EditorService = class EditorService extends Disposable {
         }
     }
     async handleMovedFile(source, target) {
-        for (const group of this.editorGroupService.groups) {
+        for (const group of this.editorGroupsContainer.groups) {
             const replacements = [];
             for (const editor of group.editors) {
                 const resource = editor.resource;
@@ -272,7 +294,7 @@ let EditorService = class EditorService extends Disposable {
         return editors;
     }
     get activeEditorPane() {
-        return this.editorGroupService.activeGroup?.activeEditorPane;
+        return this.editorGroupsContainer.activeGroup?.activeEditorPane;
     }
     get activeTextEditorControl() {
         const activeEditorPane = this.activeEditorPane;
@@ -308,12 +330,12 @@ let EditorService = class EditorService extends Disposable {
         switch (order) {
             case 0 :
                 if (options?.excludeSticky) {
-                    return this.editorsObserver.editors.filter(({ groupId, editor }) => !this.editorGroupService.getGroup(groupId)?.isSticky(editor));
+                    return this.editorsObserver.editors.filter(({ groupId, editor }) => !this.editorGroupsContainer.getGroup(groupId)?.isSticky(editor));
                 }
                 return this.editorsObserver.editors;
             case 1 : {
                 const editors = [];
-                for (const group of this.editorGroupService.getGroups(2 )) {
+                for (const group of this.editorGroupsContainer.getGroups(2 )) {
                     editors.push(...( group.getEditors(1 , options).map(editor => ({ editor, groupId: group.id }))));
                 }
                 return editors;
@@ -321,11 +343,11 @@ let EditorService = class EditorService extends Disposable {
         }
     }
     get activeEditor() {
-        const activeGroup = this.editorGroupService.activeGroup;
+        const activeGroup = this.editorGroupsContainer.activeGroup;
         return activeGroup ? activeGroup.activeEditor ?? undefined : undefined;
     }
     get visibleEditorPanes() {
-        return coalesce(( this.editorGroupService.groups.map(group => group.activeEditorPane)));
+        return coalesce(( this.editorGroupsContainer.groups.map(group => group.activeEditorPane)));
     }
     get visibleTextEditorControls() {
         const visibleTextEditorControls = [];
@@ -338,7 +360,7 @@ let EditorService = class EditorService extends Disposable {
         return visibleTextEditorControls;
     }
     get visibleEditors() {
-        return coalesce(( this.editorGroupService.groups.map(group => group.activeEditor)));
+        return coalesce(( this.editorGroupsContainer.groups.map(group => group.activeEditor)));
     }
     async openEditor(editor, optionsOrPreferredGroup, preferredGroup) {
         let typedEditor = undefined;
@@ -487,7 +509,7 @@ let EditorService = class EditorService extends Disposable {
         });
     }
     isVisible(editor) {
-        for (const group of this.editorGroupService.groups) {
+        for (const group of this.editorGroupsContainer.groups) {
             if (group.activeEditor?.matches(editor)) {
                 return true;
             }
@@ -495,13 +517,13 @@ let EditorService = class EditorService extends Disposable {
         return false;
     }
     async closeEditor({ editor, groupId }, options) {
-        const group = this.editorGroupService.getGroup(groupId);
+        const group = this.editorGroupsContainer.getGroup(groupId);
         await group?.closeEditor(editor, options);
     }
     async closeEditors(editors, options) {
         const mapGroupToEditors = ( new Map());
         for (const { editor, groupId } of editors) {
-            const group = this.editorGroupService.getGroup(groupId);
+            const group = this.editorGroupsContainer.getGroup(groupId);
             if (!group) {
                 continue;
             }
@@ -528,7 +550,7 @@ let EditorService = class EditorService extends Disposable {
             }
         }
         if (!isUndefined(arg2)) {
-            const targetGroup = typeof arg2 === 'number' ? this.editorGroupService.getGroup(arg2) : arg2;
+            const targetGroup = typeof arg2 === 'number' ? this.editorGroupsContainer.getGroup(arg2) : arg2;
             if (URI.isUri(arg1)) {
                 if (!targetGroup) {
                     return [];
@@ -550,7 +572,7 @@ let EditorService = class EditorService extends Disposable {
         }
         else {
             const result = [];
-            for (const group of this.editorGroupService.getGroups(1 )) {
+            for (const group of this.editorGroupsContainer.getGroups(1 )) {
                 const editors = [];
                 if (URI.isUri(arg1)) {
                     editors.push(...this.findEditors(arg1, options, group));
@@ -567,7 +589,7 @@ let EditorService = class EditorService extends Disposable {
         }
     }
     async replaceEditors(replacements, group) {
-        const targetGroup = typeof group === 'number' ? this.editorGroupService.getGroup(group) : group;
+        const targetGroup = typeof group === 'number' ? this.editorGroupsContainer.getGroup(group) : group;
         const typedReplacements = [];
         for (const replacement of replacements) {
             let typedReplacement = undefined;
@@ -619,7 +641,7 @@ let EditorService = class EditorService extends Disposable {
         }
         const saveResults = await Promises.settled(( editorsToSaveParallel.map(({ groupId, editor }) => {
             if (options?.reason === 1 ) {
-                this.editorGroupService.getGroup(groupId)?.pinEditor(editor);
+                this.editorGroupsContainer.getGroup(groupId)?.pinEditor(editor);
             }
             return editor.save(groupId, options);
         })));
@@ -638,7 +660,7 @@ let EditorService = class EditorService extends Disposable {
                 break;
             }
             if (!editor.matches(result)) {
-                const targetGroups = editor.hasCapability(4 ) ? ( this.editorGroupService.groups.map(group => group.id) ) : [groupId];
+                const targetGroups = editor.hasCapability(4 ) ? ( this.editorGroupsContainer.groups.map(group => group.id) ) : [groupId];
                 for (const targetGroup of targetGroups) {
                     if (result instanceof EditorInput) {
                         await this.replaceEditors([{ editor, replacement: result, options: editorOptions }], targetGroup);
@@ -663,7 +685,7 @@ let EditorService = class EditorService extends Disposable {
         }
         const uniqueEditors = this.getUniqueEditors(editors);
         await Promises.settled(( uniqueEditors.map(async ({ groupId, editor }) => {
-            this.editorGroupService.getGroup(groupId)?.pinEditor(editor);
+            this.editorGroupsContainer.getGroup(groupId)?.pinEditor(editor);
             return editor.revert(groupId, options);
         })));
         return !( uniqueEditors.some(({ editor }) => editor.isDirty()));
@@ -673,7 +695,7 @@ let EditorService = class EditorService extends Disposable {
     }
     getAllModifiedEditors(options) {
         const editors = [];
-        for (const group of this.editorGroupService.getGroups(1 )) {
+        for (const group of this.editorGroupsContainer.getGroups(1 )) {
             for (const editor of group.getEditors(0 )) {
                 if (!editor.isModified()) {
                     continue;
@@ -709,16 +731,16 @@ let EditorService = class EditorService extends Disposable {
         this.activeOutOfWorkspaceWatchers.clear();
     }
 };
-EditorService = ( __decorate([
-    ( __param(0, IEditorGroupsService)),
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IFileService)),
-    ( __param(3, IConfigurationService)),
-    ( __param(4, IWorkspaceContextService)),
-    ( __param(5, IUriIdentityService)),
-    ( __param(6, IEditorResolverService)),
-    ( __param(7, IWorkspaceTrustRequestService)),
-    ( __param(8, IHostService)),
-    ( __param(9, ITextEditorService))
+EditorService = EditorService_1 = ( __decorate([
+    ( __param(1, IEditorGroupsService)),
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IFileService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IWorkspaceContextService)),
+    ( __param(6, IUriIdentityService)),
+    ( __param(7, IEditorResolverService)),
+    ( __param(8, IWorkspaceTrustRequestService)),
+    ( __param(9, IHostService)),
+    ( __param(10, ITextEditorService))
 ], EditorService));
 export { EditorService };