@opensumi/ide-editor 2.15.9 → 2.16.0

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

@@ -2,41 +2,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EditorGroup = exports.WorkbenchEditorServiceImpl = void 0;
 const tslib_1 = require("tslib");
-const monaco = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/editor/editor.api"));
 const mobx_1 = require("mobx");
-const common_1 = require("../common");
 const di_1 = require("@opensumi/di");
-const ide_core_common_1 = require("@opensumi/ide-core-common");
-const types_1 = require("./types");
-const grid_service_1 = require("./grid/grid.service");
-const functional_1 = require("@opensumi/ide-core-common/lib/functional");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
-const types_2 = require("./doc-model/types");
-const ide_core_common_2 = require("@opensumi/ide-core-common");
 const resource_1 = require("@opensumi/ide-core-browser/lib/contextkey/resource");
+const ide_core_common_1 = require("@opensumi/ide-core-common");
+const ide_core_common_2 = require("@opensumi/ide-core-common");
+const functional_1 = require("@opensumi/ide-core-common/lib/functional");
 const ide_overlay_1 = require("@opensumi/ide-overlay");
+const monaco = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/editor/editor.api"));
+const common_1 = require("../common");
+const types_1 = require("./doc-model/types");
 const error_1 = require("./error");
-let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_core_common_1.WithEventBus {
+const grid_service_1 = require("./grid/grid.service");
+const types_2 = require("./types");
+let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_core_common_2.WithEventBus {
     constructor() {
         super();
         this.editorGroups = [];
-        this._onDidEditorGroupsChanged = new ide_core_common_1.Emitter();
+        this._onDidEditorGroupsChanged = new ide_core_common_2.Emitter();
         this.onDidEditorGroupsChanged = this._onDidEditorGroupsChanged.event;
         this._sortedEditorGroups = [];
-        this._onActiveResourceChange = new ide_core_common_1.Emitter();
+        this._onActiveResourceChange = new ide_core_common_2.Emitter();
         this.onActiveResourceChange = this._onActiveResourceChange.event;
-        this._onActiveEditorUriChange = new ide_core_common_1.Emitter();
+        this._onActiveEditorUriChange = new ide_core_common_2.Emitter();
         this.onActiveEditorUriChange = this._onActiveEditorUriChange.event;
-        this._onCursorChange = new ide_core_common_1.Emitter();
+        this._onCursorChange = new ide_core_common_2.Emitter();
         this.onCursorChange = this._onCursorChange.event;
-        this._onDidCurrentEditorGroupChanged = new ide_core_common_1.Emitter();
+        this._onDidCurrentEditorGroupChanged = new ide_core_common_2.Emitter();
         this.onDidCurrentEditorGroupChanged = this._onDidCurrentEditorGroupChanged.event;
         this._restoring = true;
-        this.contributionsReady = new ide_core_common_1.Deferred();
+        this.contributionsReady = new ide_core_common_2.Deferred();
         this.untitledIndex = 1;
         this.untitledCloseIndex = [];
         this.gridReady = false;
-        this._onDidGridReady = new ide_core_common_1.Emitter();
+        this._onDidGridReady = new ide_core_common_2.Emitter();
         this.onDidGridReady = this._onDidGridReady.event;
         this.initialize();
     }
@@ -51,7 +51,7 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
             }
             this._currentEditorGroup = editorGroup;
             this._onActiveResourceChange.fire(editorGroup.currentResource);
-            this.eventBus.fire(new types_1.EditorActiveResourceStateChangedEvent({
+            this.eventBus.fire(new types_2.EditorActiveResourceStateChangedEvent({
                 resource: editorGroup.currentResource,
                 openType: editorGroup.currentOpenType,
                 editorUri: (_a = this.currentEditor) === null || _a === void 0 ? void 0 : _a.currentUri,
@@ -62,7 +62,7 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
     onEditorGroupChangeEvent(e) {
         var _a;
         if (e.payload.group === this.currentEditorGroup) {
-            this.eventBus.fire(new types_1.EditorActiveResourceStateChangedEvent({
+            this.eventBus.fire(new types_2.EditorActiveResourceStateChangedEvent({
                 resource: e.payload.newResource,
                 openType: e.payload.newOpenType,
                 editorUri: (_a = this.currentEditor) === null || _a === void 0 ? void 0 : _a.currentUri,
@@ -97,7 +97,7 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
     createEditorGroup() {
         const editorGroup = this.injector.get(EditorGroup, [this.generateRandomEditorGroupName()]);
         this.editorGroups.push(editorGroup);
-        const currentWatchDisposer = new ide_core_common_1.Disposable(editorGroup.onDidEditorGroupBodyChanged(() => {
+        const currentWatchDisposer = new ide_core_common_2.Disposable(editorGroup.onDidEditorGroupBodyChanged(() => {
             if (editorGroup === this.currentEditorGroup) {
                 if (!editorGroup.currentOpenType && editorGroup.currentResource) {
                     // 暂时状态，不发事件
@@ -135,8 +135,6 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
                 this._onCursorChange.fire(e);
             }
         });
-        this._sortedEditorGroups = undefined;
-        this._onDidEditorGroupsChanged.fire();
         return editorGroup;
     }
     /**
@@ -162,7 +160,7 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
         this._currentEditorGroup = this.editorGroups[0];
     }
     async initializeState() {
-        const state = await this.getStorage(ide_core_common_1.STORAGE_NAMESPACE.WORKBENCH);
+        const state = await this.getStorage(ide_core_common_2.STORAGE_NAMESPACE.WORKBENCH);
         return state;
     }
     get currentEditor() {
@@ -219,14 +217,12 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
                 this.setCurrentGroup(this.editorGroups[0]);
             }
             for (let i = index; i < this.editorGroups.length; i++) {
-                this.eventBus.fire(new types_1.EditorGroupIndexChangedEvent({
+                this.eventBus.fire(new types_2.EditorGroupIndexChangedEvent({
                     group: this.editorGroups[i],
                     index: i,
                 }));
             }
-            this._onDidEditorGroupsChanged.fire();
         }
-        this._sortedEditorGroups = undefined;
     }
     async saveOpenedResourceState() {
         if (this._restoring) {
@@ -288,10 +284,18 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
             this.editorContextKeyService.attachToDomNode(domNode);
         }
     }
+    notifyGroupChanged() {
+        this._sortedEditorGroups = undefined;
+        this._onDidEditorGroupsChanged.fire();
+    }
     async restoreState() {
         let state = { editorGroup: { uris: [], previewIndex: -1 } };
         state = this.openedResourceState.get('grid', state);
         this.topGrid = new grid_service_1.EditorGrid();
+        this.topGrid.onDidGridAndDesendantStateChange(() => {
+            this._sortedEditorGroups = undefined;
+            this._onDidEditorGroupsChanged.fire();
+        });
         const editorRestorePromises = [];
         const promise = this.topGrid
             .deserialize(state, () => this.createEditorGroup(), editorRestorePromises)
@@ -301,6 +305,7 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
             }
             this.gridReady = true;
             this._onDidGridReady.fire();
+            this.notifyGroupChanged();
         });
         Promise.all(editorRestorePromises).then(() => {
             this._restoring = false;
@@ -333,7 +338,7 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
         return this._sortedEditorGroups;
     }
     handleOnCloseUntitledResource(e) {
-        if (e.payload.resource.uri.scheme === ide_core_common_2.Schemas.untitled) {
+        if (e.payload.resource.uri.scheme === ide_core_common_1.Schemas.untitled) {
             const { index } = e.payload.resource.uri.getParsedQuery();
             this.untitledCloseIndex.push(parseInt(index, 10));
             // 升序排序，每次可以去到最小的 index
@@ -343,7 +348,7 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
     createUntitledURI() {
         // 优先从已删除的 index 中获取
         const index = this.untitledCloseIndex.shift() || this.untitledIndex++;
-        return new ide_core_common_1.URI().withScheme(ide_core_common_2.Schemas.untitled).withQuery(`name=Untitled-${index}&index=${index}`);
+        return new ide_core_common_2.URI().withScheme(ide_core_common_1.Schemas.untitled).withQuery(`name=Untitled-${index}&index=${index}`);
     }
     createUntitledResource(options = {
         uri: this.createUntitledURI(),
@@ -356,27 +361,27 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", di_1.Injector)
 ], WorkbenchEditorServiceImpl.prototype, "injector", void 0);
 tslib_1.__decorate([
-    (0, di_1.Autowired)(ide_core_common_1.StorageProvider),
+    (0, di_1.Autowired)(ide_core_common_2.StorageProvider),
     tslib_1.__metadata("design:type", Function)
 ], WorkbenchEditorServiceImpl.prototype, "getStorage", void 0);
 tslib_1.__decorate([
-    (0, di_1.Autowired)(types_1.BrowserEditorContribution),
+    (0, di_1.Autowired)(types_2.BrowserEditorContribution),
     tslib_1.__metadata("design:type", Object)
 ], WorkbenchEditorServiceImpl.prototype, "contributions", void 0);
 tslib_1.__decorate([
-    (0, di_1.Autowired)(types_2.IEditorDocumentModelService),
+    (0, di_1.Autowired)(types_1.IEditorDocumentModelService),
     tslib_1.__metadata("design:type", Object)
 ], WorkbenchEditorServiceImpl.prototype, "documentModelManager", void 0);
 tslib_1.__decorate([
-    (0, ide_core_common_1.OnEvent)(types_1.EditorGroupChangeEvent),
+    (0, ide_core_common_2.OnEvent)(types_2.EditorGroupChangeEvent),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [types_1.EditorGroupChangeEvent]),
+    tslib_1.__metadata("design:paramtypes", [types_2.EditorGroupChangeEvent]),
     tslib_1.__metadata("design:returntype", void 0)
 ], WorkbenchEditorServiceImpl.prototype, "onEditorGroupChangeEvent", null);
 tslib_1.__decorate([
-    (0, ide_core_common_1.OnEvent)(types_1.EditorGroupCloseEvent),
+    (0, ide_core_common_2.OnEvent)(types_2.EditorGroupCloseEvent),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [types_1.EditorGroupCloseEvent]),
+    tslib_1.__metadata("design:paramtypes", [types_2.EditorGroupCloseEvent]),
     tslib_1.__metadata("design:returntype", void 0)
 ], WorkbenchEditorServiceImpl.prototype, "handleOnCloseUntitledResource", null);
 WorkbenchEditorServiceImpl = tslib_1.__decorate([
@@ -388,27 +393,27 @@ exports.WorkbenchEditorServiceImpl = WorkbenchEditorServiceImpl;
  * Editor Group是一个可视的编辑区域
  * 它由tab，editor，diff-editor，富组件container组成
  */
-let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
+let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
     constructor(name) {
         super();
         this.name = name;
         this.openingPromise = new Map();
-        this._onDidEditorFocusChange = this.registerDispose(new ide_core_common_1.Emitter());
+        this._onDidEditorFocusChange = this.registerDispose(new ide_core_common_2.Emitter());
         this.onDidEditorFocusChange = this._onDidEditorFocusChange.event;
         /**
          * 当编辑器的tab部分发生变更
          */
-        this._onDidEditorGroupTabChanged = new ide_core_common_1.Emitter();
+        this._onDidEditorGroupTabChanged = new ide_core_common_2.Emitter();
         this.onDidEditorGroupTabChanged = this._onDidEditorGroupTabChanged.event;
         /**
          * 当编辑器的主体部分发生变更
          */
-        this._onDidEditorGroupBodyChanged = new ide_core_common_1.Emitter();
+        this._onDidEditorGroupBodyChanged = new ide_core_common_2.Emitter();
         this.onDidEditorGroupBodyChanged = this._onDidEditorGroupBodyChanged.event;
         /**
          * 当编辑器有内容处于加载状态
          */
-        this._onDidEditorGroupContentLoading = new ide_core_common_1.Emitter();
+        this._onDidEditorGroupContentLoading = new ide_core_common_2.Emitter();
         this.onDidEditorGroupContentLoading = this._onDidEditorGroupContentLoading.event;
         /**
          * 每个group只能有一个preview
@@ -435,24 +440,24 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         this._codeEditorPendingLayout = false;
         this._diffEditorPendingLayout = false;
         // 当前为EditorComponent，且monaco光标变化时触发
-        this._onCurrentEditorCursorChange = new ide_core_common_1.Emitter();
+        this._onCurrentEditorCursorChange = new ide_core_common_2.Emitter();
         this.onCurrentEditorCursorChange = this._onCurrentEditorCursorChange.event;
         this.resourceOpenHistory = [];
         this._domNode = null;
-        this.codeEditorReady = new ide_core_common_1.ReadyEvent();
-        this.diffEditorReady = new ide_core_common_1.ReadyEvent();
+        this.codeEditorReady = new ide_core_common_2.ReadyEvent();
+        this.diffEditorReady = 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)) {
                 this.doLayoutEditors();
             }
         });
-        this.eventBus.on(types_1.GridResizeEvent, (e) => {
+        this.eventBus.on(types_2.GridResizeEvent, (e) => {
             if (e.payload.gridId === this.grid.uid) {
                 this.doLayoutEditors();
             }
         });
-        this.eventBus.on(types_1.EditorComponentDisposeEvent, (e) => {
+        this.eventBus.on(types_2.EditorComponentDisposeEvent, (e) => {
             this.activeComponents.delete(e.payload);
             this.activateComponentsProps.delete(e.payload);
         });
@@ -601,7 +606,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                 this._onDidEditorFocusChange.fire();
             }
         };
-        this.updateContextKeyWhenEditorChangesFocusDisposer = new ide_core_common_1.Disposable(this.diffEditor.modifiedEditor.onFocus(() => {
+        this.updateContextKeyWhenEditorChangesFocusDisposer = new ide_core_common_2.Disposable(this.diffEditor.modifiedEditor.onFocus(() => {
             this._currentOrPreviousFocusedEditor = this.diffEditor.modifiedEditor;
             this.setContextKeys();
             this._onDidEditorFocusChange.fire();
@@ -746,7 +751,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         }));
         this.toDispose.push(this.codeEditor.onSelectionsChanged((e) => {
             if (this.currentOpenType && this.currentOpenType.type === 'code') {
-                this.eventBus.fire(new types_1.EditorSelectionChangeEvent({
+                this.eventBus.fire(new types_2.EditorSelectionChangeEvent({
                     group: this,
                     resource: this.currentResource,
                     selections: e.selections,
@@ -757,7 +762,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         }));
         this.toDispose.push(this.codeEditor.onVisibleRangesChanged((e) => {
             if (this.currentOpenType && this.currentOpenType.type === 'code') {
-                this.eventBus.fire(new types_1.EditorVisibleChangeEvent({
+                this.eventBus.fire(new types_2.EditorVisibleChangeEvent({
                     group: this,
                     resource: this.currentResource,
                     visibleRanges: e,
@@ -767,14 +772,14 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         }));
         this.toDispose.push(this.codeEditor.onConfigurationChanged(() => {
             if (this.currentOpenType && this.currentOpenType.type === 'code') {
-                this.eventBus.fire(new types_1.EditorConfigurationChangedEvent({
+                this.eventBus.fire(new types_2.EditorConfigurationChangedEvent({
                     group: this,
                     resource: this.currentResource,
                     editorUri: this.codeEditor.currentUri,
                 }));
             }
         }));
-        this.eventBus.fire(new types_1.CodeEditorDidVisibleEvent({
+        this.eventBus.fire(new types_2.CodeEditorDidVisibleEvent({
             groupName: this.name,
             type: 'code',
             editorId: this.codeEditor.getId(),
@@ -791,7 +796,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         // 这里应该还要加上 originalEditor 的相关监听，目前为了避免复杂度，先不放
         this.toDispose.push(this.diffEditor.modifiedEditor.onSelectionsChanged((e) => {
             if (this.currentOpenType && this.currentOpenType.type === 'diff') {
-                this.eventBus.fire(new types_1.EditorSelectionChangeEvent({
+                this.eventBus.fire(new types_2.EditorSelectionChangeEvent({
                     group: this,
                     resource: this.currentResource,
                     selections: e.selections,
@@ -802,7 +807,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         }));
         this.toDispose.push(this.diffEditor.modifiedEditor.onVisibleRangesChanged((e) => {
             if (this.currentOpenType && this.currentOpenType.type === 'diff') {
-                this.eventBus.fire(new types_1.EditorVisibleChangeEvent({
+                this.eventBus.fire(new types_2.EditorVisibleChangeEvent({
                     group: this,
                     resource: this.currentResource,
                     visibleRanges: e,
@@ -812,14 +817,14 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         }));
         this.toDispose.push(this.diffEditor.modifiedEditor.onConfigurationChanged(() => {
             if (this.currentOpenType && this.currentOpenType.type === 'diff') {
-                this.eventBus.fire(new types_1.EditorConfigurationChangedEvent({
+                this.eventBus.fire(new types_2.EditorConfigurationChangedEvent({
                     group: this,
                     resource: this.currentResource,
                     editorUri: this.diffEditor.modifiedEditor.currentUri,
                 }));
             }
         }));
-        this.eventBus.fire(new types_1.CodeEditorDidVisibleEvent({
+        this.eventBus.fire(new types_2.CodeEditorDidVisibleEvent({
             groupName: this.name,
             type: 'diff',
             editorId: this.diffEditor.modifiedEditor.getId(),
@@ -850,7 +855,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         return editorGroup.open(uri, Object.assign(Object.assign({}, options), { preview: false }));
     }
     async open(uri, options = {}) {
-        if (uri.scheme === ide_core_common_2.Schemas.file) {
+        if (uri.scheme === ide_core_common_1.Schemas.file) {
             // 只记录 file 类型的
             this.recentFilesManager.setMostRecentlyOpenedFile(uri.withoutFragment().toString());
         }
@@ -866,7 +871,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                 this.openingPromise.delete(uri.toString());
             });
         }
-        const previewMode = this.preferenceService.get('editor.previewMode') && ((0, ide_core_common_2.isUndefinedOrNull)(options.preview) ? true : options.preview);
+        const previewMode = this.preferenceService.get('editor.previewMode') && ((0, ide_core_common_1.isUndefinedOrNull)(options.preview) ? true : options.preview);
         if (!previewMode) {
             this.openingPromise.get(uri.toString()).then(() => {
                 this.pinPreviewed(uri);
@@ -886,7 +891,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         let resourceReady;
         try {
             const previewMode = this.preferenceService.get('editor.previewMode') &&
-                ((0, ide_core_common_2.isUndefinedOrNull)(options.preview) ? true : options.preview);
+                ((0, ide_core_common_1.isUndefinedOrNull)(options.preview) ? true : options.preview);
             if (this.currentResource && this.currentResource.uri.isEqual(uri)) {
                 // 就是当前打开的resource
                 if (options.focus && this.currentEditor) {
@@ -974,8 +979,8 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                 this._currentOpenType = null;
                 this.notifyBodyChanged();
                 // 只有真正打开的文件才会走到这里，backend模式的只更新了tab，文件内容并未加载
-                const reportTimer = this.reporterService.time(ide_core_common_2.REPORT_NAME.EDITOR_REACTIVE);
-                resourceReady = new ide_core_common_1.Deferred();
+                const reportTimer = this.reporterService.time(ide_core_common_1.REPORT_NAME.EDITOR_REACTIVE);
+                resourceReady = new ide_core_common_2.Deferred();
                 this.resourceStatus.set(resource, resourceReady.promise);
                 // 超过60ms loading时间的才展示加载
                 const delayTimer = setTimeout(() => {
@@ -988,7 +993,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                 this._currentOrPreviousFocusedEditor = this.currentEditor;
                 this._onDidEditorFocusChange.fire();
                 this.setContextKeys();
-                this.eventBus.fire(new types_1.EditorGroupOpenEvent({
+                this.eventBus.fire(new types_2.EditorGroupOpenEvent({
                     group: this,
                     resource,
                 }));
@@ -998,7 +1003,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                 else {
                     this.locateInFileTree(uri);
                 }
-                this.eventBus.fire(new types_1.EditorGroupChangeEvent({
+                this.eventBus.fire(new types_2.EditorGroupChangeEvent({
                     group: this,
                     newOpenType: this.currentOpenType,
                     newResource: this.currentResource,
@@ -1012,10 +1017,10 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
             }
         }
         catch (e) {
-            (0, ide_core_common_1.getDebugLogger)().error(e);
+            (0, ide_core_common_2.getDebugLogger)().error(e);
             resourceReady && resourceReady.reject();
             if (!(0, error_1.isEditorError)(e, error_1.EditorTabChangedError)) {
-                this.messageService.error((0, ide_core_common_1.formatLocalize)('editor.failToOpen', uri.displayName, e.message), [], true);
+                this.messageService.error((0, ide_core_common_2.formatLocalize)('editor.failToOpen', uri.displayName, e.message), [], true);
             }
             return false;
             // todo 给用户显示error
@@ -1040,8 +1045,8 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
     disposeDocumentRef(uri) {
         if (uri.scheme === 'diff') {
             const query = uri.getParsedQuery();
-            this.doDisposeDocRef(new ide_core_common_1.URI(query.original));
-            this.doDisposeDocRef(new ide_core_common_1.URI(query.modified));
+            this.doDisposeDocRef(new ide_core_common_2.URI(query.original));
+            this.doDisposeDocRef(new ide_core_common_2.URI(query.modified));
         }
         else {
             this.doDisposeDocRef(uri);
@@ -1094,7 +1099,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                         // monaco 编辑器的 focus 多了一步检查，由于此时其实对应编辑器的 dom 的 display 为 none （需要等 React 下一次渲染才会改变为 block）,
                         // 会引起 document.activeElement !== editor.textArea.domNode，进而会导致focus失败
                         // 需要等待真正 append 之后再
-                        const disposer = this.eventBus.on(types_1.CodeEditorDidVisibleEvent, (e) => {
+                        const disposer = this.eventBus.on(types_2.CodeEditorDidVisibleEvent, (e) => {
                             var _a;
                             if (e.payload.groupName === this.name && e.payload.type === 'code') {
                                 disposer.dispose();
@@ -1134,7 +1139,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                     if (options.focus) {
                         (_a = this._domNode) === null || _a === void 0 ? void 0 : _a.focus();
                         // 理由见上方 codeEditor.focus 部分
-                        const disposer = this.eventBus.on(types_1.CodeEditorDidVisibleEvent, (e) => {
+                        const disposer = this.eventBus.on(types_2.CodeEditorDidVisibleEvent, (e) => {
                             if (e.payload.groupName === this.name && e.payload.type === 'diff') {
                                 disposer.dispose();
                                 if (this.disposed) {
@@ -1164,7 +1169,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                 }
                 else {
                     this.activateComponentsProps.set(component, initialProps);
-                    if (component.renderMode === types_1.EditorComponentRenderMode.ONE_PER_RESOURCE) {
+                    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) {
@@ -1172,10 +1177,10 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                         }
                         this.activeComponents.set(component, openedResources);
                     }
-                    else if (component.renderMode === types_1.EditorComponentRenderMode.ONE_PER_GROUP) {
+                    else if (component.renderMode === types_2.EditorComponentRenderMode.ONE_PER_GROUP) {
                         this.activeComponents.set(component, [resource]);
                     }
-                    else if (component.renderMode === types_1.EditorComponentRenderMode.ONE_PER_WORKBENCH) {
+                    else if (component.renderMode === types_2.EditorComponentRenderMode.ONE_PER_WORKBENCH) {
                         const promises = [];
                         this.workbenchEditorService.editorGroups.forEach((g) => {
                             if (g === this) {
@@ -1186,7 +1191,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                                 promises.push(g.close(r.uri));
                             }
                         });
-                        await Promise.all(promises).catch((0, ide_core_common_1.getDebugLogger)().error);
+                        await Promise.all(promises).catch((0, ide_core_common_2.getDebugLogger)().error);
                         this.activeComponents.set(component, [resource]);
                     }
                 }
@@ -1228,7 +1233,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                 }
             }
             this.resources.splice(index, 1);
-            this.eventBus.fire(new types_1.EditorGroupCloseEvent({
+            this.eventBus.fire(new types_2.EditorGroupCloseEvent({
                 group: this,
                 resource,
             }));
@@ -1318,7 +1323,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         this._currentOrPreviousFocusedEditor = null;
         this._onDidEditorFocusChange.fire();
         // 关闭最后一个时，应该发送一个 EditorGroupChangeEvent
-        this.eventBus.fire(new types_1.EditorGroupChangeEvent({
+        this.eventBus.fire(new types_2.EditorGroupChangeEvent({
             group: this,
             newOpenType: this.currentOpenType,
             newResource: this.currentResource,
@@ -1386,7 +1391,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         }
     }
     clearResourceOnClose(resource) {
-        this.eventBus.fire(new types_1.EditorGroupCloseEvent({
+        this.eventBus.fire(new types_2.EditorGroupCloseEvent({
             group: this,
             resource,
         }));
@@ -1431,7 +1436,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         }
         const oldOpenType = this.currentOpenType;
         await this.displayResourceComponent(this.currentResource, { forceOpenType: type });
-        this.eventBus.fire(new types_1.EditorGroupChangeEvent({
+        this.eventBus.fire(new types_2.EditorGroupChangeEvent({
             group: this,
             newOpenType: this.currentOpenType,
             newResource: this.currentResource,
@@ -1443,7 +1448,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
      * 拖拽drop方法
      */
     async dropUri(uri, position, sourceGroup, targetResource) {
-        if (position !== types_1.DragOverPosition.CENTER) {
+        if (position !== types_2.DragOverPosition.CENTER) {
             await this.split((0, common_1.getSplitActionFromDragDrop)(position), uri, { preview: false, focus: true });
         }
         else {
@@ -1486,7 +1491,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
                 // 从其他group拖动过来
                 await sourceGroup.close(uri);
             }
-            else if (position !== types_1.DragOverPosition.CENTER) {
+            else if (position !== types_2.DragOverPosition.CENTER) {
                 // split行为
                 await this.close(uri);
             }
@@ -1511,7 +1516,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
         this.codeEditor && this.codeEditor.dispose();
         this.diffEditor && this.diffEditor.dispose();
         this.toDispose.forEach((disposable) => disposable.dispose());
-        this.eventBus.fire(new types_1.EditorGroupDisposeEvent({
+        this.eventBus.fire(new types_2.EditorGroupDisposeEvent({
             group: this,
         }));
     }
@@ -1535,17 +1540,17 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
     }
     async restoreState(state) {
         this._restoringState = true;
-        this.previewURI = state.uris[state.previewIndex] ? null : new ide_core_common_1.URI(state.uris[state.previewIndex]);
+        this.previewURI = state.uris[state.previewIndex] ? null : new ide_core_common_2.URI(state.uris[state.previewIndex]);
         for (const uri of state.uris) {
-            await this.doOpen(new ide_core_common_1.URI(uri), { disableNavigate: true, backend: true, preview: false, deletedPolicy: 'skip' });
+            await this.doOpen(new ide_core_common_2.URI(uri), { disableNavigate: true, backend: true, preview: false, deletedPolicy: 'skip' });
         }
         let targetUri;
         if (state.current) {
-            targetUri = new ide_core_common_1.URI(state.current);
+            targetUri = new ide_core_common_2.URI(state.current);
         }
         else {
             if (state.uris.length > 0) {
-                targetUri = new ide_core_common_1.URI(state.uris[state.uris.length - 1]);
+                targetUri = new ide_core_common_2.URI(state.uris[state.uris.length - 1]);
             }
         }
         if (targetUri) {
@@ -1561,7 +1566,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
     async saveAll(includeUntitled, reason) {
         for (const r of this.resources) {
             // 不保存无标题文件
-            if (!includeUntitled && r.uri.scheme === ide_core_common_2.Schemas.untitled) {
+            if (!includeUntitled && r.uri.scheme === ide_core_common_1.Schemas.untitled) {
                 continue;
             }
             await this.saveResource(r, reason);
@@ -1650,18 +1655,18 @@ tslib_1.__decorate([
 ], EditorGroup.prototype, "resourceService", void 0);
 tslib_1.__decorate([
     (0, di_1.Autowired)(),
-    tslib_1.__metadata("design:type", types_1.EditorComponentRegistry)
+    tslib_1.__metadata("design:type", types_2.EditorComponentRegistry)
 ], EditorGroup.prototype, "editorComponentRegistry", void 0);
 tslib_1.__decorate([
     (0, di_1.Autowired)(common_1.WorkbenchEditorService),
     tslib_1.__metadata("design:type", WorkbenchEditorServiceImpl)
 ], EditorGroup.prototype, "workbenchEditorService", void 0);
 tslib_1.__decorate([
-    (0, di_1.Autowired)(types_2.IEditorDocumentModelService),
+    (0, di_1.Autowired)(types_1.IEditorDocumentModelService),
     tslib_1.__metadata("design:type", Object)
 ], EditorGroup.prototype, "documentModelManager", void 0);
 tslib_1.__decorate([
-    (0, di_1.Autowired)(ide_core_common_1.CommandService),
+    (0, di_1.Autowired)(ide_core_common_2.CommandService),
     tslib_1.__metadata("design:type", Object)
 ], EditorGroup.prototype, "commands", void 0);
 tslib_1.__decorate([
@@ -1677,7 +1682,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Object)
 ], EditorGroup.prototype, "messageService", void 0);
 tslib_1.__decorate([
-    (0, di_1.Autowired)(ide_core_common_1.IReporterService),
+    (0, di_1.Autowired)(ide_core_common_2.IReporterService),
     tslib_1.__metadata("design:type", Object)
 ], EditorGroup.prototype, "reporterService", void 0);
 tslib_1.__decorate([
@@ -1689,7 +1694,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Object)
 ], EditorGroup.prototype, "openerService", void 0);
 tslib_1.__decorate([
-    (0, di_1.Autowired)(ide_core_common_1.ILogger),
+    (0, di_1.Autowired)(ide_core_common_2.ILogger),
     tslib_1.__metadata("design:type", Object)
 ], EditorGroup.prototype, "logger", void 0);
 tslib_1.__decorate([
@@ -1697,19 +1702,19 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Array)
 ], EditorGroup.prototype, "availableOpenTypes", void 0);
 tslib_1.__decorate([
-    (0, ide_core_common_1.OnEvent)(common_1.ResourceDecorationChangeEvent),
+    (0, ide_core_common_2.OnEvent)(common_1.ResourceDecorationChangeEvent),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [common_1.ResourceDecorationChangeEvent]),
     tslib_1.__metadata("design:returntype", void 0)
 ], EditorGroup.prototype, "onResourceDecorationChangeEvent", null);
 tslib_1.__decorate([
-    (0, ide_core_common_1.OnEvent)(types_1.ResourceOpenTypeChangedEvent),
+    (0, ide_core_common_2.OnEvent)(types_2.ResourceOpenTypeChangedEvent),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [types_1.ResourceOpenTypeChangedEvent]),
+    tslib_1.__metadata("design:paramtypes", [types_2.ResourceOpenTypeChangedEvent]),
     tslib_1.__metadata("design:returntype", void 0)
 ], EditorGroup.prototype, "oResourceOpenTypeChangedEvent", null);
 tslib_1.__decorate([
-    (0, ide_core_common_1.OnEvent)(types_1.RegisterEditorComponentEvent),
+    (0, ide_core_common_2.OnEvent)(types_2.RegisterEditorComponentEvent),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", []),
     tslib_1.__metadata("design:returntype", Promise)