@opensumi/ide-editor 3.3.1-next-1725432779.0 → 3.3.1-next-1725462155.0

package/lib/browser/workbench-editor.service.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EditorGroup = exports.WorkbenchEditorServiceImpl = void 0;
 const tslib_1 = require("tslib");
+const mobx_1 = require("mobx");
 const di_1 = require("@opensumi/di");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
 const resource_1 = require("@opensumi/ide-core-browser/lib/contextkey/resource");
@@ -120,37 +121,44 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
     createEditorGroup() {
         const editorGroup = this.injector.get(EditorGroup, [this.generateRandomEditorGroupName(), this.editorGroupIdGen++]);
         this.editorGroups.push(editorGroup);
-        editorGroup.addDispose([
-            editorGroup.onDidEditorGroupBodyChanged(() => {
-                if (editorGroup === this.currentEditorGroup) {
-                    if (!editorGroup.currentOpenType && editorGroup.currentResource) {
-                        // 暂时状态，不发事件
-                    }
-                    else {
-                        this._onActiveResourceChange.fire(editorGroup.currentResource);
-                    }
+        const currentWatchDisposer = new ide_core_common_1.Disposable(editorGroup.onDidEditorGroupBodyChanged(() => {
+            if (editorGroup === this.currentEditorGroup) {
+                if (!editorGroup.currentOpenType && editorGroup.currentResource) {
+                    // 暂时状态，不发事件
                 }
-            }),
-            editorGroup.onDidEditorFocusChange(() => {
-                var _a;
-                if (editorGroup === this.currentEditorGroup) {
-                    if (!editorGroup.currentOpenType && editorGroup.currentResource) {
-                        // 暂时状态，不发事件
-                    }
-                    else {
-                        this._onActiveEditorUriChange.fire((_a = editorGroup.currentOrPreviousFocusedEditor) === null || _a === void 0 ? void 0 : _a.currentUri);
-                    }
+                else {
+                    this._onActiveResourceChange.fire(editorGroup.currentResource);
                 }
-            }),
-            editorGroup.onDidEditorGroupTabChanged(() => {
-                this.saveOpenedResourceState();
-            }),
-            editorGroup.onCurrentEditorCursorChange((e) => {
-                if (this._currentEditorGroup === editorGroup) {
-                    this._onCursorChange.fire(e);
+            }
+        }), editorGroup.onDidEditorFocusChange(() => {
+            var _a;
+            if (editorGroup === this.currentEditorGroup) {
+                if (!editorGroup.currentOpenType && editorGroup.currentResource) {
+                    // 暂时状态，不发事件
                 }
-            }),
-        ]);
+                else {
+                    this._onActiveEditorUriChange.fire((_a = editorGroup.currentOrPreviousFocusedEditor) === null || _a === void 0 ? void 0 : _a.currentUri);
+                }
+            }
+        }));
+        editorGroup.addDispose({
+            dispose: () => {
+                currentWatchDisposer.dispose();
+            },
+        });
+        const groupChangeDisposer = editorGroup.onDidEditorGroupTabChanged(() => {
+            this.saveOpenedResourceState();
+        });
+        editorGroup.addDispose({
+            dispose: () => {
+                groupChangeDisposer.dispose();
+            },
+        });
+        editorGroup.onCurrentEditorCursorChange((e) => {
+            if (this._currentEditorGroup === editorGroup) {
+                this._onCursorChange.fire(e);
+            }
+        });
         return editorGroup;
     }
     /**
@@ -489,22 +497,22 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         /**
          * 当编辑器的tab部分发生变更
          */
-        this._onDidEditorGroupTabChanged = this.registerDispose(new ide_core_common_1.Emitter());
+        this._onDidEditorGroupTabChanged = new ide_core_common_1.Emitter();
         this.onDidEditorGroupTabChanged = this._onDidEditorGroupTabChanged.event;
         /**
          * 当编辑器的tab部分发生变更
          */
-        this._onDidEditorGroupTabOperation = this.registerDispose(new ide_core_common_1.Emitter());
+        this._onDidEditorGroupTabOperation = new ide_core_common_1.Emitter();
         this.onDidEditorGroupTabOperation = this._onDidEditorGroupTabOperation.event;
         /**
          * 当编辑器的主体部分发生变更
          */
-        this._onDidEditorGroupBodyChanged = this.registerDispose(new ide_core_common_1.Emitter());
+        this._onDidEditorGroupBodyChanged = new ide_core_common_1.Emitter();
         this.onDidEditorGroupBodyChanged = this._onDidEditorGroupBodyChanged.event;
         /**
          * 当编辑器有内容处于加载状态
          */
-        this._onDidEditorGroupContentLoading = this.registerDispose(new ide_core_common_1.Emitter());
+        this._onDidEditorGroupContentLoading = new ide_core_common_1.Emitter();
         this.onDidEditorGroupContentLoading = this._onDidEditorGroupContentLoading.event;
         /**
          * 每个group只能有一个preview
@@ -524,10 +532,14 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         this.activeComponents = new Map();
         this.activateComponentsProps = new Map();
         this.holdDocumentModelRefs = new Map();
+        this.toDispose = [];
         this._prevDomHeight = 0;
         this._prevDomWidth = 0;
+        this._codeEditorPendingLayout = false;
+        this._diffEditorPendingLayout = false;
+        this._mergeEditorPendingLayout = false;
         // 当前为EditorComponent，且monaco光标变化时触发
-        this._onCurrentEditorCursorChange = this.registerDispose(new ide_core_common_1.Emitter());
+        this._onCurrentEditorCursorChange = new ide_core_common_1.Emitter();
         this.onCurrentEditorCursorChange = this._onCurrentEditorCursorChange.event;
         this.resourceOpenHistory = [];
         this._domNode = null;
@@ -541,24 +553,32 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         this.mergeEditorReady = new ide_core_common_1.ReadyEvent();
         this.mergeEditorDomReady = new ide_core_common_1.ReadyEvent();
         this._restoringState = false;
-        this.addDispose(this.eventBus.onDirective(ide_core_browser_1.ResizeEvent.createDirective((0, ide_core_browser_1.getSlotLocation)('@opensumi/ide-editor', this.config.layoutConfig)), () => {
-            this.layoutEditors();
-        }));
-        this.addDispose(this.eventBus.on(types_2.GridResizeEvent, (e) => {
+        let toDispose;
+        this.eventBus.onDirective(ide_core_browser_1.ResizeEvent.createDirective((0, ide_core_browser_1.getSlotLocation)('@opensumi/ide-editor', this.config.layoutConfig)), () => {
+            if (toDispose) {
+                toDispose.dispose();
+            }
+            toDispose = ide_core_browser_1.fastdom.mutate(() => {
+                this._layoutEditorWorker();
+            });
+        });
+        this.eventBus.on(types_2.GridResizeEvent, (e) => {
             if (e.payload.gridId === this.grid.uid) {
-                this.layoutEditors();
+                this.doLayoutEditors();
             }
-        }));
-        this.addDispose(this.eventBus.on(types_2.EditorComponentDisposeEvent, (e) => {
+        });
+        this.eventBus.on(types_2.EditorComponentDisposeEvent, (e) => {
             this.activeComponents.delete(e.payload);
             this.activateComponentsProps.delete(e.payload);
-        }));
+        });
         this.listenToExplorerAutoRevealConfig();
     }
     listenToExplorerAutoRevealConfig() {
         this.explorerAutoRevealConfig = !!this.preferenceService.get('explorer.autoReveal');
-        this.disposables.push(this.preferenceService.onSpecificPreferenceChange('explorer.autoReveal', (change) => {
-            this.explorerAutoRevealConfig = change.newValue;
+        this.disposables.push(this.preferenceService.onPreferenceChanged((change) => {
+            if (change.preferenceName === 'explorer.autoReveal') {
+                this.explorerAutoRevealConfig = change.newValue;
+            }
         }));
     }
     attachDiffEditorDom(domNode) {
@@ -585,26 +605,47 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
     layoutEditors() {
         ide_core_browser_1.fastdom.measure(() => {
             if (this._domNode) {
-                this._prevDomWidth = this._domNode.offsetWidth;
-                this._prevDomHeight = this._domNode.offsetHeight;
-                this.doLayoutEditors({
-                    width: this._prevDomWidth,
-                    height: this._prevDomHeight,
-                }, true);
+                const currentWidth = this._domNode.offsetWidth;
+                const currentHeight = this._domNode.offsetHeight;
+                if (currentWidth !== this._prevDomWidth || currentHeight !== this._prevDomHeight) {
+                    this.doLayoutEditors();
+                }
+                this._prevDomWidth = currentWidth;
+                this._prevDomHeight = currentHeight;
             }
         });
     }
-    doLayoutEditors(e, postponeRendering) {
+    _layoutEditorWorker() {
         if (this.codeEditor) {
             if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.code) {
-                this.codeEditor.layout(e, postponeRendering);
+                this.codeEditor.layout();
+                this._codeEditorPendingLayout = false;
+            }
+            else {
+                this._codeEditorPendingLayout = true;
             }
         }
         if (this.diffEditor) {
             if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.diff) {
-                this.diffEditor.layout(e, postponeRendering);
+                this.diffEditor.layout();
+                this._diffEditorPendingLayout = false;
+            }
+            else {
+                this._diffEditorPendingLayout = true;
             }
         }
+        if (this.mergeEditor) {
+            if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.mergeEditor) {
+                // this.mergeEditor.layout();
+                this._mergeEditorPendingLayout = false;
+            }
+            else {
+                this._mergeEditorPendingLayout = true;
+            }
+        }
+    }
+    doLayoutEditors() {
+        this._layoutEditorWorker();
     }
     setContextKeys() {
         var _a;
@@ -725,6 +766,9 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         }
         if (this.currentResource && this.currentResource.uri.isEqual(uri)) {
             this._currentOpenType = null;
+            this._codeEditorPendingLayout = false;
+            this._diffEditorPendingLayout = false;
+            this._mergeEditorPendingLayout = false;
             this.notifyBodyChanged();
             this.displayResourceComponent(this.currentResource, {});
         }
@@ -824,17 +868,15 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
             [ide_core_browser_1.ServiceNames.CONTEXT_KEY_SERVICE]: this.contextKeyService.contextKeyService,
         });
         setTimeout(() => {
-            ide_core_browser_1.fastdom.mutate(() => {
-                this.codeEditor.layout();
-            });
+            this.codeEditor.layout();
         });
         this.addDispose(this.codeEditor.onRefOpen(() => {
             this.codeEditor.layout();
         }));
-        this.addDispose(this.codeEditor.onCursorPositionChanged((e) => {
+        this.toDispose.push(this.codeEditor.onCursorPositionChanged((e) => {
             this._onCurrentEditorCursorChange.fire(e);
         }));
-        this.addDispose(this.codeEditor.onSelectionsChanged((e) => {
+        this.toDispose.push(this.codeEditor.onSelectionsChanged((e) => {
             if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.code) {
                 this.eventBus.fire(new types_2.EditorSelectionChangeEvent({
                     group: this,
@@ -845,7 +887,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                 }));
             }
         }));
-        this.addDispose(this.codeEditor.onVisibleRangesChanged((e) => {
+        this.toDispose.push(this.codeEditor.onVisibleRangesChanged((e) => {
             if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.code) {
                 this.eventBus.fire(new types_2.EditorVisibleChangeEvent({
                     group: this,
@@ -855,7 +897,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                 }));
             }
         }));
-        this.addDispose(this.codeEditor.onConfigurationChanged(() => {
+        this.toDispose.push(this.codeEditor.onConfigurationChanged(() => {
             if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.code) {
                 this.eventBus.fire(new types_2.EditorConfigurationChangedEvent({
                     group: this,
@@ -882,14 +924,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
             [ide_core_browser_1.ServiceNames.CONTEXT_KEY_SERVICE]: this.contextKeyService.contextKeyService,
         });
         setTimeout(() => {
-            ide_core_browser_1.fastdom.mutate(() => {
-                this.diffEditor.layout();
-            });
-        });
-        this.diffEditor.onRefOpen(() => {
-            ide_core_browser_1.fastdom.mutate(() => {
-                this.diffEditor.layout();
-            });
+            this.diffEditor.layout();
         });
         this.addDiffEditorEventListeners(this.diffEditor.originalEditor, 'original');
         this.addDiffEditorEventListeners(this.diffEditor.modifiedEditor, 'modified');
@@ -906,7 +941,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         this.diffEditorReady.ready();
     }
     addDiffEditorEventListeners(editor, side) {
-        this.addDispose(editor.onSelectionsChanged((e) => {
+        this.toDispose.push(editor.onSelectionsChanged((e) => {
             if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.diff) {
                 this.eventBus.fire(new types_2.EditorSelectionChangeEvent({
                     group: this,
@@ -918,7 +953,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                 }));
             }
         }));
-        this.addDispose(editor.onVisibleRangesChanged((e) => {
+        this.toDispose.push(editor.onVisibleRangesChanged((e) => {
             if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.diff) {
                 this.eventBus.fire(new types_2.EditorVisibleChangeEvent({
                     group: this,
@@ -928,7 +963,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                 }));
             }
         }));
-        this.addDispose(editor.onConfigurationChanged(() => {
+        this.toDispose.push(editor.onConfigurationChanged(() => {
             if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.diff) {
                 this.eventBus.fire(new types_2.EditorConfigurationChangedEvent({
                     group: this,
@@ -1435,7 +1470,11 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
             this.resolveTabChanged(_resource, this.currentResource);
             this._currentOpenType = activeOpenType;
             this.notifyBodyChanged();
-            this.layoutEditors();
+            if ((!this._codeEditorPendingLayout && activeOpenType.type === types_2.EditorOpenType.code) ||
+                (!this._diffEditorPendingLayout && activeOpenType.type === types_2.EditorOpenType.diff) ||
+                (!this._mergeEditorPendingLayout && activeOpenType.type === types_2.EditorOpenType.mergeEditor)) {
+                this.doLayoutEditors();
+            }
             this.cachedResourcesActiveOpenTypes.set(resource.uri.toString(), activeOpenType);
         }
     }
@@ -1561,6 +1600,9 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         const oldResource = this._currentResource;
         this._currentResource = null;
         this._currentOpenType = null;
+        this._codeEditorPendingLayout = false;
+        this._diffEditorPendingLayout = false;
+        this._mergeEditorPendingLayout = false;
         this.notifyTabChanged();
         this.notifyBodyChanged();
         this._currentOrPreviousFocusedEditor = null;
@@ -1792,6 +1834,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         super.dispose();
         this.codeEditor && this.codeEditor.dispose();
         this.diffEditor && this.diffEditor.dispose();
+        this.toDispose.forEach((disposable) => disposable.dispose());
         this.eventBus.fire(new types_2.EditorGroupDisposeEvent({
             group: this,
         }));
@@ -1992,6 +2035,16 @@ tslib_1.__decorate([
     (0, di_1.Autowired)(ide_core_common_1.ILogger),
     tslib_1.__metadata("design:type", Object)
 ], EditorGroup.prototype, "logger", void 0);
+tslib_1.__decorate([
+    mobx_1.observable.shallow,
+    tslib_1.__metadata("design:type", Array)
+], EditorGroup.prototype, "availableOpenTypes", void 0);
+tslib_1.__decorate([
+    (0, ide_core_common_1.debounce)(16 * 5),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", void 0)
+], EditorGroup.prototype, "doLayoutEditors", null);
 tslib_1.__decorate([
     (0, ide_core_common_1.OnEvent)(common_1.ResourceDecorationChangeEvent),
     tslib_1.__metadata("design:type", Function),