@opensumi/ide-editor 3.8.3-next-1747817292.0 → 3.8.3-next-1747895552.0

package/src/browser/multi-diff/multi-diff-editor.ts

@@ -1,9 +1,9 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import { PreferenceService } from '@opensumi/ide-core-browser';
 import {
-  Disposable,
   DisposableStore,
   Emitter,
+  Event,
   IDisposable,
   ILogger,
   OnEvent,
@@ -35,17 +35,14 @@ import { IMultiDiffResourceId } from '@opensumi/monaco-editor-core/esm/vs/editor
 import { Range } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/range';
 import { IDiffEditor } from '@opensumi/monaco-editor-core/esm/vs/editor/common/editorCommon';
 
-import {
-  EditorCollectionService,
-  EditorType,
-  IEditorDocumentModelRef,
-  IResourceOpenOptions,
-} from '../../common/editor';
+import { EditorType, IEditorDocumentModelRef, IResourceOpenOptions } from '../../common/editor';
 import { IMultiDiffEditor, IMultiDiffSourceResolverService, IResolvedMultiDiffSource } from '../../common/multi-diff';
+import { DiffEditorPart } from '../base-editor-wrapper';
 import { EditorDocumentModelContentChangedEvent, IEditorDocumentModelService } from '../doc-model/types';
-import { DiffEditorPart, EditorCollectionServiceImpl } from '../editor-collection.service';
 import { IConvertedMonacoOptions, IResource, ResourceDecorationNeedChangeEvent } from '../types';
 
+import type { EditorCollectionServiceImpl } from '../editor-collection.service';
+
 @Injectable({ multiple: true })
 export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEditor {
   @Autowired(INJECTOR_TOKEN)
@@ -63,9 +60,6 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
   @Autowired(IMultiDiffSourceResolverService)
   private readonly multiDiffSourceResolverService: IMultiDiffSourceResolverService;
 
-  @Autowired(EditorCollectionService)
-  private readonly collectionService: EditorCollectionServiceImpl;
-
   @Autowired(ILogger)
   logger: ILogger;
 
@@ -77,13 +71,13 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
 
   private multiDiffModel: IMultiDiffEditorModel & IDisposable;
 
-  constructor(private multiDiffWidget: MultiDiffEditorWidget, private convertedOptions: IConvertedMonacoOptions) {
+  constructor(
+    private multiDiffWidget: MultiDiffEditorWidget,
+    private convertedOptions: IConvertedMonacoOptions,
+    private editorCollectionService: EditorCollectionServiceImpl,
+  ) {
     super();
-    this.wrapEditors();
-  }
-
-  private wrapEditors() {
-    this.collectionService.addMultiDiffEditors([this]);
+    this.editorCollectionService.addMultiDiffEditors([this]);
   }
 
   @OnEvent(EditorDocumentModelContentChangedEvent)
@@ -133,6 +127,27 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
     }
   }
 
+  private createAndRegisterEditorParts(
+    modifiedEditor: { editor: ICodeEditor } | undefined,
+    originalEditor: { editor: ICodeEditor } | undefined,
+    modifiedInstance: any,
+    originalInstance: any,
+  ): void {
+    const modifiedDiffEditorPart = this.injector.get(DiffEditorPart, [
+      modifiedEditor?.editor,
+      () => modifiedInstance,
+      EditorType.MODIFIED_DIFF,
+    ]);
+
+    const originalDiffEditorPart = this.injector.get(DiffEditorPart, [
+      originalEditor?.editor,
+      () => originalInstance,
+      EditorType.ORIGINAL_DIFF,
+    ]);
+
+    this.editorCollectionService.addEditors([modifiedDiffEditorPart, originalDiffEditorPart]);
+  }
+
   async compareMultiple(editor: IMultiDiffEditor, resource: IResource, options?: IResourceOpenOptions): Promise<void> {
     // Save current view state before changing
     if (this.currentUri) {
@@ -234,20 +249,28 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
       if (!modified || !original) {
         continue;
       }
-      const modifiedEditor = this.multiDiffWidget.tryGetCodeEditor(modified?.uri);
-      const originalEditor = this.multiDiffWidget.tryGetCodeEditor(original?.uri);
-      const modifiedDiffEditorPart = this.injector.get(DiffEditorPart, [
-        modifiedEditor?.editor,
-        () => (ref.object as any).modifiedInstance,
-        EditorType.MODIFIED_DIFF,
-      ]);
-
-      const originalDiffEditorPart = this.injector.get(DiffEditorPart, [
-        originalEditor?.editor,
-        () => (ref.object as any).originalInstance,
-        EditorType.ORIGINAL_DIFF,
-      ]);
-      this.collectionService.addEditors([modifiedDiffEditorPart, originalDiffEditorPart]);
+      let modifiedEditor = this.multiDiffWidget.tryGetCodeEditor(modified?.uri);
+      let originalEditor = this.multiDiffWidget.tryGetCodeEditor(original?.uri);
+      if (!modifiedEditor || !originalEditor) {
+        Event.once(modified.onDidChangeTokens)(() => {
+          modifiedEditor = this.multiDiffWidget.tryGetCodeEditor(modified?.uri);
+          originalEditor = this.multiDiffWidget.tryGetCodeEditor(original?.uri);
+          this.createAndRegisterEditorParts(
+            modifiedEditor,
+            originalEditor,
+            (ref.object as any).modifiedInstance,
+            (ref.object as any).originalInstance,
+          );
+        });
+        continue;
+      }
+
+      this.createAndRegisterEditorParts(
+        modifiedEditor,
+        originalEditor,
+        (ref.object as any).modifiedInstance,
+        (ref.object as any).originalInstance,
+      );
     }
     this.multiDiffModelChangeEmitter.fire(this.multiDiffModel);
   }