@opensumi/ide-editor 2.21.13 → 2.22.0

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

@@ -6,6 +6,7 @@ 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");
+const merge_editor_widget_1 = require("@opensumi/ide-core-browser/lib/monaco/merge-editor-widget");
 const ide_core_common_1 = require("@opensumi/ide-core-common");
 const ide_core_common_2 = require("@opensumi/ide-core-common");
 const ide_overlay_1 = require("@opensumi/ide-overlay");
@@ -504,13 +505,21 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
         this._prevDomWidth = 0;
         this._codeEditorPendingLayout = false;
         this._diffEditorPendingLayout = false;
+        this._mergeEditorPendingLayout = false;
         // 当前为EditorComponent，且monaco光标变化时触发
         this._onCurrentEditorCursorChange = new ide_core_common_2.Emitter();
         this.onCurrentEditorCursorChange = this._onCurrentEditorCursorChange.event;
         this.resourceOpenHistory = [];
         this._domNode = null;
+        this._diffEditorDomNode = null;
+        this._diffEditorDomNodeAttached = false;
+        this._mergeEditorDomNode = null;
+        this._mergeEditorDomNodeAttached = false;
         this.codeEditorReady = new ide_core_common_2.ReadyEvent();
         this.diffEditorReady = new ide_core_common_2.ReadyEvent();
+        this.diffEditorDomReady = new ide_core_common_2.ReadyEvent();
+        this.mergeEditorReady = new ide_core_common_2.ReadyEvent();
+        this.mergeEditorDomReady = new ide_core_common_2.ReadyEvent();
         this._restoringState = false;
         this.eventBus.on(ide_core_browser_1.ResizeEvent, (e) => {
             if (e.payload.slotLocation === (0, ide_core_browser_1.getSlotLocation)('@opensumi/ide-editor', this.config.layoutConfig)) {
@@ -536,6 +545,20 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
             }
         }));
     }
+    attachDiffEditorDom(domNode) {
+        if (!this._diffEditorDomNodeAttached) {
+            this._diffEditorDomNode = domNode;
+            this.diffEditorDomReady.ready();
+            this._diffEditorDomNodeAttached = true;
+        }
+    }
+    attachMergeEditorDom(domNode) {
+        if (!this._mergeEditorDomNodeAttached) {
+            this._mergeEditorDomNode = domNode;
+            this.mergeEditorDomReady.ready();
+            this._mergeEditorDomNodeAttached = true;
+        }
+    }
     attachToDom(domNode) {
         this._domNode = domNode;
         if (domNode) {
@@ -556,7 +579,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
     }
     doLayoutEditors() {
         if (this.codeEditor) {
-            if (this.currentOpenType && this.currentOpenType.type === 'code') {
+            if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.code) {
                 this.codeEditor.layout();
                 this._codeEditorPendingLayout = false;
             }
@@ -565,7 +588,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
             }
         }
         if (this.diffEditor) {
-            if (this.currentOpenType && this.currentOpenType.type === 'diff') {
+            if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.diff) {
                 this.diffEditor.layout();
                 this._diffEditorPendingLayout = false;
             }
@@ -573,27 +596,16 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
                 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;
+            }
+        }
     }
-    // get currentState() {
-    //   return this._currentState;
-    // }
-    // set currentState(value: IEditorCurrentState | null) {
-    //   const oldResource = this.currentResource;
-    //   const oldOpenType = this.currentOpenType;
-    //   this._currentState = value;
-    //   this._pendingState = null;
-    //   if (oldResource && this.resourceOpenHistory[this.resourceOpenHistory.length - 1] !== oldResource.uri) {
-    //     this.resourceOpenHistory.push(oldResource.uri);
-    //   }
-    //   this.eventBus.fire(new EditorGroupChangeEvent({
-    //     group: this,
-    //     newOpenType: this.currentOpenType,
-    //     newResource: this.currentResource,
-    //     oldOpenType,
-    //     oldResource,
-    //   }));
-    //   this.setContextKeys();
-    // }
     setContextKeys() {
         var _a;
         if (!this._resourceContext) {
@@ -756,10 +768,10 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
     }
     get currentEditor() {
         if (this.currentOpenType) {
-            if (this.currentOpenType.type === 'code') {
+            if (this.currentOpenType.type === types_2.EditorOpenType.code) {
                 return this.codeEditor;
             }
-            else if (this.currentOpenType.type === 'diff') {
+            else if (this.currentOpenType.type === types_2.EditorOpenType.diff) {
                 return this.diffEditor.modifiedEditor;
             }
             else {
@@ -775,12 +787,12 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
     }
     get currentFocusedEditor() {
         if (this.currentOpenType) {
-            if (this.currentOpenType.type === 'code') {
+            if (this.currentOpenType.type === types_2.EditorOpenType.code) {
                 if (this.codeEditor.monacoEditor.hasWidgetFocus()) {
                     return this.codeEditor;
                 }
             }
-            else if (this.currentOpenType.type === 'diff') {
+            else if (this.currentOpenType.type === types_2.EditorOpenType.diff) {
                 if (this.diffEditor.modifiedEditor.monacoEditor.hasTextFocus()) {
                     return this.diffEditor.modifiedEditor;
                 }
@@ -799,7 +811,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
     }
     get currentCodeEditor() {
         if (this.currentOpenType) {
-            if (this.currentOpenType.type === 'code') {
+            if (this.currentOpenType.type === types_2.EditorOpenType.code) {
                 return this.codeEditor;
             }
             else {
@@ -821,7 +833,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
             this._onCurrentEditorCursorChange.fire(e);
         }));
         this.toDispose.push(this.codeEditor.onSelectionsChanged((e) => {
-            if (this.currentOpenType && this.currentOpenType.type === 'code') {
+            if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.code) {
                 this.eventBus.fire(new types_2.EditorSelectionChangeEvent({
                     group: this,
                     resource: this.currentResource,
@@ -832,7 +844,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
             }
         }));
         this.toDispose.push(this.codeEditor.onVisibleRangesChanged((e) => {
-            if (this.currentOpenType && this.currentOpenType.type === 'code') {
+            if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.code) {
                 this.eventBus.fire(new types_2.EditorVisibleChangeEvent({
                     group: this,
                     resource: this.currentResource,
@@ -842,7 +854,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
             }
         }));
         this.toDispose.push(this.codeEditor.onConfigurationChanged(() => {
-            if (this.currentOpenType && this.currentOpenType.type === 'code') {
+            if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.code) {
                 this.eventBus.fire(new types_2.EditorConfigurationChangedEvent({
                     group: this,
                     resource: this.currentResource,
@@ -852,11 +864,17 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
         }));
         this.eventBus.fire(new types_2.CodeEditorDidVisibleEvent({
             groupName: this.name,
-            type: 'code',
+            type: types_2.EditorOpenType.code,
             editorId: this.codeEditor.getId(),
         }));
         this.codeEditorReady.ready();
     }
+    createMergeEditor(dom) {
+        this.mergeEditor = this.collectionService.createMergeEditor(dom, {}, {
+            [ide_core_browser_1.ServiceNames.CONTEXT_KEY_SERVICE]: this.contextKeyService.contextKeyService,
+        });
+        this.mergeEditorReady.ready();
+    }
     createDiffEditor(dom) {
         this.diffEditor = this.collectionService.createDiffEditor(dom, {}, {
             [ide_core_browser_1.ServiceNames.CONTEXT_KEY_SERVICE]: this.contextKeyService.contextKeyService,
@@ -868,12 +886,12 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
         this.addDiffEditorEventListeners(this.diffEditor.modifiedEditor, 'modified');
         this.eventBus.fire(new types_2.CodeEditorDidVisibleEvent({
             groupName: this.name,
-            type: 'diff',
+            type: types_2.EditorOpenType.diff,
             editorId: this.diffEditor.modifiedEditor.getId(),
         }));
         this.eventBus.fire(new types_2.CodeEditorDidVisibleEvent({
             groupName: this.name,
-            type: 'diff',
+            type: types_2.EditorOpenType.diff,
             editorId: this.diffEditor.originalEditor.getId(),
         }));
         this.diffEditorReady.ready();
@@ -881,7 +899,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
     addDiffEditorEventListeners(editor, side) {
         this.toDispose.push(editor.onSelectionsChanged((e) => {
             var _a;
-            if (this.currentOpenType && this.currentOpenType.type === 'diff') {
+            if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.diff) {
                 this.eventBus.fire(new types_2.EditorSelectionChangeEvent({
                     group: this,
                     resource: this.currentResource,
@@ -893,7 +911,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
             }
         }));
         this.toDispose.push(editor.onVisibleRangesChanged((e) => {
-            if (this.currentOpenType && this.currentOpenType.type === 'diff') {
+            if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.diff) {
                 this.eventBus.fire(new types_2.EditorVisibleChangeEvent({
                     group: this,
                     resource: this.currentResource,
@@ -903,7 +921,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
             }
         }));
         this.toDispose.push(editor.onConfigurationChanged(() => {
-            if (this.currentOpenType && this.currentOpenType.type === 'diff') {
+            if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.diff) {
                 this.eventBus.fire(new types_2.EditorConfigurationChangedEvent({
                     group: this,
                     resource: this.currentResource,
@@ -1142,161 +1160,220 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
             this.holdDocumentModelRefs.delete(uri.toString());
         }
     }
-    async displayResourceComponent(resource, options) {
-        if (options.revealRangeInCenter === undefined) {
-            options.revealRangeInCenter = true;
-        }
-        const _resource = resource;
-        const result = await this.resolveOpenType(resource, options);
-        if (result) {
-            const { activeOpenType, openTypes } = result;
-            this.availableOpenTypes = openTypes;
-            if (options.preserveFocus) {
-                options.focus = false;
+    async openCodeEditor(resource, options) {
+        const documentRef = await this.getDocumentModelRef(resource.uri);
+        this.resolveTabChanged(resource, this.currentResource);
+        await this.codeEditorReady.onceReady(async () => {
+            var _a;
+            await this.codeEditor.open(documentRef);
+            if (options.range) {
+                const range = new monaco.Range(options.range.startLineNumber, options.range.startColumn, options.range.endLineNumber, options.range.endColumn);
+                // 这里使用 setTimeout 在下一次事件循环时将编辑器滚动到指定位置
+                // 原因是在打开新文件的情况下
+                // setModel 后立即调用 revealRangeInCenter 编辑器无法获取到 viewport 宽高
+                // 导致无法正确计算滚动位置
+                this.codeEditor.monacoEditor.setSelection(range);
+                if (options.revealRangeInCenter) {
+                    setTimeout(() => {
+                        this.codeEditor.monacoEditor.revealRangeInCenter(range, 1);
+                    });
+                }
             }
-            if (activeOpenType.type === 'code') {
-                const documentRef = await this.getDocumentModelRef(resource.uri);
-                this.resolveTabChanged(_resource, this.currentResource);
-                await this.codeEditorReady.onceReady(async () => {
+            // 同上
+            queueMicrotask(() => {
+                if (options.scrollTop) {
+                    this.codeEditor.monacoEditor.setScrollTop(options.scrollTop);
+                }
+                if (options.scrollLeft) {
+                    this.codeEditor.monacoEditor.setScrollLeft(options.scrollLeft);
+                }
+            });
+            if (options.focus) {
+                (_a = this._domNode) === null || _a === void 0 ? void 0 : _a.focus();
+                // monaco 编辑器的 focus 多了一步检查，由于此时其实对应编辑器的 dom 的 display 为 none （需要等 React 下一次渲染才会改变为 block）,
+                // 会引起 document.activeElement !== editor.textArea.domNode，进而会导致focus失败
+                // 需要等待真正 append 之后再
+                const disposer = this.eventBus.on(types_2.CodeEditorDidVisibleEvent, (e) => {
                     var _a;
-                    await this.codeEditor.open(documentRef);
-                    if (options.range) {
-                        const range = new monaco.Range(options.range.startLineNumber, options.range.startColumn, options.range.endLineNumber, options.range.endColumn);
-                        // 这里使用 setTimeout 在下一次事件循环时将编辑器滚动到指定位置
-                        // 原因是在打开新文件的情况下
-                        // setModel 后立即调用 revealRangeInCenter 编辑器无法获取到 viewport 宽高
-                        // 导致无法正确计算滚动位置
-                        this.codeEditor.monacoEditor.setSelection(range);
-                        if (options.revealRangeInCenter) {
-                            setTimeout(() => {
-                                this.codeEditor.monacoEditor.revealRangeInCenter(range, 1);
-                            });
-                        }
-                    }
-                    // 同上
-                    queueMicrotask(() => {
-                        if (options.scrollTop) {
-                            this.codeEditor.monacoEditor.setScrollTop(options.scrollTop);
+                    if (e.payload.groupName === this.name && e.payload.type === types_2.EditorOpenType.code) {
+                        disposer.dispose();
+                        // 此处必须多做一些检查以免不必要的 focus
+                        if (this.disposed) {
+                            return;
                         }
-                        if (options.scrollLeft) {
-                            this.codeEditor.monacoEditor.setScrollLeft(options.scrollLeft);
+                        if (this !== this.workbenchEditorService.currentEditorGroup) {
+                            return;
                         }
-                    });
-                    if (options.focus) {
-                        (_a = this._domNode) === null || _a === void 0 ? void 0 : _a.focus();
-                        // monaco 编辑器的 focus 多了一步检查，由于此时其实对应编辑器的 dom 的 display 为 none （需要等 React 下一次渲染才会改变为 block）,
-                        // 会引起 document.activeElement !== editor.textArea.domNode，进而会导致focus失败
-                        // 需要等待真正 append 之后再
-                        const disposer = this.eventBus.on(types_2.CodeEditorDidVisibleEvent, (e) => {
-                            var _a;
-                            if (e.payload.groupName === this.name && e.payload.type === 'code') {
-                                disposer.dispose();
-                                // 此处必须多做一些检查以免不必要的 focus
-                                if (this.disposed) {
-                                    return;
-                                }
-                                if (this !== this.workbenchEditorService.currentEditorGroup) {
-                                    return;
-                                }
-                                if (this.currentEditor === this.codeEditor && ((_a = this.codeEditor.currentUri) === null || _a === void 0 ? void 0 : _a.isEqual(resource.uri))) {
-                                    try {
-                                        this.codeEditor.focus();
-                                    }
-                                    catch (e) {
-                                        // noop
-                                    }
-                                }
+                        if (this.currentEditor === this.codeEditor && ((_a = this.codeEditor.currentUri) === null || _a === void 0 ? void 0 : _a.isEqual(resource.uri))) {
+                            try {
+                                this.codeEditor.focus();
                             }
-                        });
+                            catch (e) {
+                                // noop
+                            }
+                        }
                     }
                 });
-                // 可能在diff Editor中修改导致为脏
-                if (documentRef.instance.dirty) {
-                    this.pinPreviewed(resource.uri);
-                }
             }
-            else if (activeOpenType.type === 'diff') {
-                const diffResource = resource;
-                const [original, modified] = await Promise.all([
-                    this.getDocumentModelRef(diffResource.metadata.original),
-                    this.getDocumentModelRef(diffResource.metadata.modified),
-                ]);
-                await this.diffEditorReady.onceReady(async () => {
-                    var _a;
-                    await this.diffEditor.compare(original, modified, options, resource.uri);
-                    if (options.focus) {
-                        (_a = this._domNode) === null || _a === void 0 ? void 0 : _a.focus();
-                        // 理由见上方 codeEditor.focus 部分
-                        const disposer = this.eventBus.on(types_2.CodeEditorDidVisibleEvent, (e) => {
-                            if (e.payload.groupName === this.name && e.payload.type === 'diff') {
-                                disposer.dispose();
-                                if (this.disposed) {
-                                    return;
-                                }
-                                if (this !== this.workbenchEditorService.currentEditorGroup) {
-                                    return;
-                                }
-                                if (this.currentEditor === this.diffEditor.modifiedEditor) {
-                                    try {
-                                        this.diffEditor.focus();
-                                    }
-                                    catch (e) {
-                                        // noop
-                                    }
-                                }
+        });
+        // 可能在diff Editor中修改导致为脏
+        if (documentRef.instance.dirty) {
+            this.pinPreviewed(resource.uri);
+        }
+    }
+    async openDiffEditor(resource, options) {
+        if (!this.diffEditor) {
+            await this.diffEditorDomReady.onceReady(() => {
+                var _a;
+                const container = document.createElement('div');
+                (_a = this._diffEditorDomNode) === null || _a === void 0 ? void 0 : _a.appendChild(container);
+                this.createDiffEditor(container);
+            });
+        }
+        const diffResource = resource;
+        const [original, modified] = await Promise.all([
+            this.getDocumentModelRef(diffResource.metadata.original),
+            this.getDocumentModelRef(diffResource.metadata.modified),
+        ]);
+        await this.diffEditorReady.onceReady(async () => {
+            var _a;
+            await this.diffEditor.compare(original, modified, options, resource.uri);
+            if (options.focus) {
+                (_a = this._domNode) === null || _a === void 0 ? void 0 : _a.focus();
+                // 理由见上方 codeEditor.focus 部分
+                const disposer = this.eventBus.on(types_2.CodeEditorDidVisibleEvent, (e) => {
+                    if (e.payload.groupName === this.name && e.payload.type === types_2.EditorOpenType.diff) {
+                        disposer.dispose();
+                        if (this.disposed) {
+                            return;
+                        }
+                        if (this !== this.workbenchEditorService.currentEditorGroup) {
+                            return;
+                        }
+                        if (this.currentEditor === this.diffEditor.modifiedEditor) {
+                            try {
+                                this.diffEditor.focus();
                             }
-                        });
+                            catch (e) {
+                                // noop
+                            }
+                        }
                     }
                 });
             }
-            else if (activeOpenType.type === 'component') {
-                const component = this.editorComponentRegistry.getEditorComponent(activeOpenType.componentId);
-                const initialProps = this.editorComponentRegistry.getEditorInitialProps(activeOpenType.componentId);
-                if (!component) {
-                    throw new Error('Cannot find Editor Component with id: ' + activeOpenType.componentId);
+        });
+    }
+    async openMergeEditor(resource) {
+        const { metadata } = resource;
+        if (!metadata) {
+            return;
+        }
+        if (!this.mergeEditor) {
+            await this.mergeEditorDomReady.onceReady(() => {
+                var _a;
+                const container = document.createElement('div');
+                (_a = this._mergeEditorDomNode) === null || _a === void 0 ? void 0 : _a.appendChild(container);
+                this.createMergeEditor(container);
+            });
+        }
+        const { ancestor, input1, input2, output } = metadata;
+        const input1Data = merge_editor_widget_1.MergeEditorInputData.from(input1);
+        const input2Data = merge_editor_widget_1.MergeEditorInputData.from(input2);
+        const [ancestorRef, input1Ref, outputRef, input2Ref] = await Promise.all([
+            this.getDocumentModelRef(ide_core_common_2.URI.parse(ancestor)),
+            this.getDocumentModelRef(input1Data.uri),
+            this.getDocumentModelRef(ide_core_common_2.URI.parse(output)),
+            this.getDocumentModelRef(input2Data.uri),
+        ]);
+        await this.mergeEditorReady.onceReady(async () => {
+            await this.mergeEditor.open({
+                ancestor: {
+                    uri: ide_core_common_2.URI.parse(metadata.ancestor),
+                    textModel: ancestorRef.instance.getMonacoModel(),
+                },
+                input1: input1Data.setTextModel(input1Ref.instance.getMonacoModel()),
+                input2: input2Data.setTextModel(input2Ref.instance.getMonacoModel()),
+                output: {
+                    uri: ide_core_common_2.URI.parse(metadata.output),
+                    textModel: outputRef.instance.getMonacoModel(),
+                },
+            });
+        });
+    }
+    async openCustomEditor(resource, componentId) {
+        const component = this.editorComponentRegistry.getEditorComponent(componentId);
+        const initialProps = this.editorComponentRegistry.getEditorInitialProps(componentId);
+        if (!component) {
+            throw new Error('Cannot find Editor Component with id: ' + componentId);
+        }
+        else {
+            this.activateComponentsProps.set(component, initialProps);
+            if (component.renderMode === types_2.EditorComponentRenderMode.ONE_PER_RESOURCE) {
+                const openedResources = this.activeComponents.get(component) || [];
+                const index = openedResources.findIndex((r) => r.uri.toString() === resource.uri.toString());
+                if (index === -1) {
+                    openedResources.push(resource);
                 }
-                else {
-                    this.activateComponentsProps.set(component, initialProps);
-                    if (component.renderMode === types_2.EditorComponentRenderMode.ONE_PER_RESOURCE) {
-                        const openedResources = this.activeComponents.get(component) || [];
-                        const index = openedResources.findIndex((r) => r.uri.toString() === resource.uri.toString());
-                        if (index === -1) {
-                            openedResources.push(resource);
-                        }
-                        this.activeComponents.set(component, openedResources);
-                    }
-                    else if (component.renderMode === types_2.EditorComponentRenderMode.ONE_PER_GROUP) {
-                        this.activeComponents.set(component, [resource]);
+                this.activeComponents.set(component, openedResources);
+            }
+            else if (component.renderMode === types_2.EditorComponentRenderMode.ONE_PER_GROUP) {
+                this.activeComponents.set(component, [resource]);
+            }
+            else if (component.renderMode === types_2.EditorComponentRenderMode.ONE_PER_WORKBENCH) {
+                const promises = [];
+                this.workbenchEditorService.editorGroups.forEach((g) => {
+                    if (g === this) {
+                        return;
                     }
-                    else if (component.renderMode === types_2.EditorComponentRenderMode.ONE_PER_WORKBENCH) {
-                        const promises = [];
-                        this.workbenchEditorService.editorGroups.forEach((g) => {
-                            if (g === this) {
-                                return;
-                            }
-                            const r = g.resources.find((r) => r.uri.isEqual(resource.uri));
-                            if (r) {
-                                promises.push(g.close(r.uri));
-                            }
-                        });
-                        await Promise.all(promises).catch((0, ide_core_common_2.getDebugLogger)().error);
-                        this.activeComponents.set(component, [resource]);
+                    const r = g.resources.find((r) => r.uri.isEqual(resource.uri));
+                    if (r) {
+                        promises.push(g.close(r.uri));
                     }
-                }
-                // 打开非编辑器的component时需要手动触发
-                this._onCurrentEditorCursorChange.fire({
-                    position: null,
-                    selectionLength: 0,
                 });
+                await Promise.all(promises).catch((0, ide_core_common_2.getDebugLogger)().error);
+                this.activeComponents.set(component, [resource]);
             }
-            else {
-                return; // other type not handled
+        }
+        // 打开非编辑器的component时需要手动触发
+        this._onCurrentEditorCursorChange.fire({
+            position: null,
+            selectionLength: 0,
+        });
+    }
+    async displayResourceComponent(resource, options) {
+        if (options.revealRangeInCenter === undefined) {
+            options.revealRangeInCenter = true;
+        }
+        const _resource = resource;
+        const result = await this.resolveOpenType(resource, options);
+        if (result) {
+            const { activeOpenType, openTypes } = result;
+            this.availableOpenTypes = openTypes;
+            if (options.preserveFocus) {
+                options.focus = false;
+            }
+            switch (activeOpenType.type) {
+                case types_2.EditorOpenType.code:
+                    await this.openCodeEditor(resource, options);
+                    break;
+                case types_2.EditorOpenType.diff:
+                    await this.openDiffEditor(resource, options);
+                    break;
+                case types_2.EditorOpenType.mergeEditor:
+                    await this.openMergeEditor(resource);
+                    break;
+                case types_2.EditorOpenType.component:
+                    await this.openCustomEditor(resource, activeOpenType.componentId);
+                    break;
+                default:
+                    return;
             }
             this.resolveTabChanged(_resource, this.currentResource);
             this._currentOpenType = activeOpenType;
             this.notifyBodyChanged();
-            if ((this._codeEditorPendingLayout && activeOpenType.type === 'code') ||
-                (this._diffEditorPendingLayout && activeOpenType.type === 'diff')) {
+            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);
@@ -1599,10 +1676,10 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
     }
     focus() {
         this.gainFocus();
-        if (this.currentOpenType && this.currentOpenType.type === 'code') {
+        if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.code) {
             this.codeEditor.focus();
         }
-        if (this.currentOpenType && this.currentOpenType.type === 'diff') {
+        if (this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.diff) {
             this.diffEditor.focus();
         }
     }
@@ -1627,13 +1704,13 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
         };
     }
     isCodeEditorMode() {
-        return !!this.currentOpenType && this.currentOpenType.type === 'code';
+        return !!this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.code;
     }
     isDiffEditorMode() {
-        return !!this.currentOpenType && this.currentOpenType.type === 'diff';
+        return !!this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.diff;
     }
     isComponentMode() {
-        return !!this.currentOpenType && this.currentOpenType.type === 'component';
+        return !!this.currentOpenType && this.currentOpenType.type === types_2.EditorOpenType.component;
     }
     async restoreState(state) {
         this._restoringState = true;
@@ -1824,6 +1901,12 @@ 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)(100),
+    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_2.OnEvent)(common_1.ResourceDecorationChangeEvent),
     tslib_1.__metadata("design:type", Function),
@@ -1871,6 +1954,6 @@ function findSuitableOpenType(currentAvailable, prev, resource, editorAssociatio
     return currentAvailable[0];
 }
 function openTypeSimilar(a, b) {
-    return a.type === b.type && (a.type !== 'component' || a.componentId === b.componentId);
+    return a.type === b.type && (a.type !== types_2.EditorOpenType.component || a.componentId === b.componentId);
 }
 //# sourceMappingURL=workbench-editor.service.js.map