@opensumi/ide-editor 3.9.1-next-1748403761.0 → 3.9.1-next-1748425167.0

package/src/browser/editor-collection.service.ts

@@ -1,15 +1,19 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
-import { IContextKeyService, PreferenceService } from '@opensumi/ide-core-browser';
+import { AppConfig, IContextKeyService, IRange, PreferenceService } from '@opensumi/ide-core-browser';
 import { ResourceContextKey } from '@opensumi/ide-core-browser/lib/contextkey';
 import { MonacoService } from '@opensumi/ide-core-browser/lib/monaco';
 import {
+  Disposable,
   Emitter,
   Event,
   Emitter as EventEmitter,
   ILineChange,
+  ISelection,
   OnEvent,
   URI,
   WithEventBus,
+  isEmptyObject,
+  objects,
 } from '@opensumi/ide-core-common';
 import * as monaco from '@opensumi/ide-monaco';
 import { IConfigurationService } from '@opensumi/monaco-editor-core/esm/vs/platform/configuration/common/configuration';
@@ -20,19 +24,21 @@ import {
   EditorCollectionService,
   EditorType,
   ICodeEditor,
+  IDecorationApplyOptions,
   IDiffEditor,
   IEditor,
+  IResource,
   IResourceOpenOptions,
+  IUndoStopOptions,
   ResourceDecorationNeedChangeEvent,
 } from '../common';
-import { IEditorDocumentModelRef, isTextEditorViewState } from '../common/editor';
-import { IMultiDiffEditor } from '../common/multi-diff';
+import { IEditorDocumentModel, IEditorDocumentModelRef, isTextEditorViewState } from '../common/editor';
 
-import { BaseMonacoEditorWrapper, DiffEditorPart, ISumiEditor } from './base-editor-wrapper';
+import { MonacoEditorDecorationApplier } from './decoration-applier';
 import { EditorDocumentModelContentChangedEvent, IEditorDocumentModelService } from './doc-model/types';
 import { EditorFeatureRegistryImpl } from './feature';
 import { BrowserMultiDiffEditor } from './multi-diff/multi-diff-editor';
-import { getConvertedMonacoOptions, isDiffEditorOption } from './preference/converter';
+import { getConvertedMonacoOptions, isDiffEditorOption, isEditorOption } from './preference/converter';
 import { IConvertedMonacoOptions, IEditorFeatureRegistry } from './types';
 
 import type {
@@ -41,6 +47,8 @@ import type {
 } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 import type { IDiffEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
 
+const { removeUndefined } = objects;
+
 @Injectable()
 export class EditorCollectionServiceImpl extends WithEventBus implements EditorCollectionService {
   @Autowired()
@@ -57,23 +65,12 @@ export class EditorCollectionServiceImpl extends WithEventBus implements EditorC
 
   private _editors: Set<ISumiEditor> = new Set();
   private _diffEditors: Set<IDiffEditor> = new Set();
-  private _multiDiffEditors: Set<IMultiDiffEditor> = new Set();
 
   private _onCodeEditorCreate = new Emitter<ICodeEditor>();
   private _onDiffEditorCreate = new Emitter<IDiffEditor>();
-  private _onMultiDiffEditorCreate = new Emitter<IMultiDiffEditor>();
-
-  private _onCodeEditorChange = new Emitter<void>();
-  private _onDiffEditorChange = new Emitter<void>();
-  private _onMultiDiffEditorChange = new Emitter<void>();
 
   public onCodeEditorCreate = this._onCodeEditorCreate.event;
   public onDiffEditorCreate = this._onDiffEditorCreate.event;
-  public onMultiDiffEditorCreate = this._onMultiDiffEditorCreate.event;
-
-  public onCodeEditorChange = this._onCodeEditorChange.event;
-  public onDiffEditorChange = this._onDiffEditorChange.event;
-  public onMultiDiffEditorChange = this._onMultiDiffEditorChange.event;
 
   @Autowired(IEditorDocumentModelService)
   documentModelService: IEditorDocumentModelService;
@@ -131,7 +128,7 @@ export class EditorCollectionServiceImpl extends WithEventBus implements EditorC
       }
     });
     if (this._editors.size !== beforeSize) {
-      this._onCodeEditorChange.fire();
+      // fire event;
     }
   }
 
@@ -144,7 +141,7 @@ export class EditorCollectionServiceImpl extends WithEventBus implements EditorC
       }
     });
     if (this._editors.size !== beforeSize) {
-      this._onCodeEditorChange.fire();
+      // fire event;
     }
   }
 
@@ -157,11 +154,11 @@ export class EditorCollectionServiceImpl extends WithEventBus implements EditorC
     return editor;
   }
 
-  public createMultiDiffEditor(dom: HTMLElement, options?: any, overrides?: { [key: string]: any }) {
+  createMultiDiffEditor(dom: HTMLElement, options?: any, overrides?: { [key: string]: any }) {
     const convertedOptions = getConvertedMonacoOptions(this.configurationService);
     const monacoMultiDiffEditorWidget = this.monacoService.createMultiDiffEditorWidget(dom, overrides);
     const mergedOptions: IConvertedMonacoOptions = { ...convertedOptions.diffOptions, ...options };
-    const editor = this.injector.get(BrowserMultiDiffEditor, [monacoMultiDiffEditorWidget, mergedOptions, this]);
+    const editor = this.injector.get(BrowserMultiDiffEditor, [monacoMultiDiffEditorWidget, mergedOptions]);
     return editor;
   }
 
@@ -190,7 +187,7 @@ export class EditorCollectionServiceImpl extends WithEventBus implements EditorC
       }
     });
     if (this._diffEditors.size !== beforeSize) {
-      this._onDiffEditorChange.fire();
+      // fire event _onDiffEditorAdd;
     }
   }
 
@@ -200,36 +197,11 @@ export class EditorCollectionServiceImpl extends WithEventBus implements EditorC
       this._diffEditors.delete(diffEditor);
     });
     if (this._diffEditors.size !== beforeSize) {
-      this._onDiffEditorChange.fire();
-    }
-  }
-
-  public listMultiDiffEditors(): IMultiDiffEditor[] {
-    return Array.from(this._multiDiffEditors.values());
-  }
-
-  public addMultiDiffEditors(multiDiffEditors: IMultiDiffEditor[]) {
-    const beforeSize = this._multiDiffEditors.size;
-    multiDiffEditors.forEach((multiDiffEditor) => {
-      if (!this._multiDiffEditors.has(multiDiffEditor)) {
-        this._multiDiffEditors.add(multiDiffEditor);
-      }
-    });
-    if (this._multiDiffEditors.size !== beforeSize) {
-      this._onMultiDiffEditorChange.fire();
-    }
-  }
-
-  public removeMultiDiffEditors(multiDiffEditors: IMultiDiffEditor[]) {
-    const beforeSize = this._multiDiffEditors.size;
-    multiDiffEditors.forEach((multiDiffEditor) => {
-      this._multiDiffEditors.delete(multiDiffEditor);
-    });
-    if (this._multiDiffEditors.size !== beforeSize) {
-      this._onMultiDiffEditorChange.fire();
+      // fire event _onDiffEditorRemove;
     }
   }
 
+  // 将docModel的变更事件反映至resource的dirty装饰
   @OnEvent(EditorDocumentModelContentChangedEvent)
   onDocModelContentChangedEvent(e: EditorDocumentModelContentChangedEvent) {
     this.eventBus.fire(
@@ -244,6 +216,230 @@ export class EditorCollectionServiceImpl extends WithEventBus implements EditorC
   }
 }
 
+export type ISumiEditor = IEditor;
+
+export function insertSnippetWithMonacoEditor(
+  editor: IMonacoCodeEditor,
+  template: string,
+  ranges: IRange[],
+  opts: IUndoStopOptions,
+) {
+  const snippetController = editor.getContribution('snippetController2') as any;
+  const selections: ISelection[] = ranges.map(
+    (r) => new monaco.Selection(r.startLineNumber, r.startColumn, r.endLineNumber, r.endColumn),
+  );
+  editor.setSelections(selections);
+  editor.focus();
+
+  snippetController.insert(template, 0, 0, opts.undoStopBefore, opts.undoStopAfter);
+}
+
+function updateOptionsWithMonacoEditor(
+  monacoEditor: IMonacoCodeEditor,
+  editorOptions: monaco.editor.IEditorOptions,
+  modelOptions: monaco.editor.ITextModelUpdateOptions,
+) {
+  monacoEditor.updateOptions(editorOptions);
+  if (monacoEditor.getModel()) {
+    monacoEditor.getModel()!.updateOptions(modelOptions);
+  }
+}
+
+@Injectable({ multiple: true })
+export abstract class BaseMonacoEditorWrapper extends WithEventBus implements IEditor {
+  public abstract readonly currentDocumentModel: IEditorDocumentModel | null;
+
+  public get currentUri(): URI | null {
+    return this.currentDocumentModel ? this.currentDocumentModel.uri : null;
+  }
+
+  public getId() {
+    return this.monacoEditor.getId();
+  }
+
+  getSelections() {
+    return this.monacoEditor.getSelections() || [];
+  }
+
+  public onFocus = this.monacoEditor.onDidFocusEditorWidget;
+
+  public onBlur = this.monacoEditor.onDidBlurEditorWidget;
+
+  protected _specialEditorOptions: any = {};
+
+  protected _specialModelOptions: monaco.editor.ITextModelUpdateOptions = {};
+
+  protected _editorOptionsFromContribution: any = {};
+
+  @Autowired(IEditorFeatureRegistry)
+  protected readonly editorFeatureRegistry: IEditorFeatureRegistry;
+
+  @Autowired(IConfigurationService)
+  protected readonly configurationService: IConfigurationService;
+
+  protected readonly decorationApplier: MonacoEditorDecorationApplier;
+
+  private _disableSelectionEmitter = false;
+
+  protected disableSelectionEmitter() {
+    this._disableSelectionEmitter = true;
+  }
+
+  protected enableSelectionEmitter() {
+    this._disableSelectionEmitter = false;
+  }
+
+  @Autowired(INJECTOR_TOKEN)
+  private injector: Injector;
+
+  constructor(public readonly monacoEditor: IMonacoCodeEditor, private type: EditorType) {
+    super();
+    this.decorationApplier = this.injector.get(MonacoEditorDecorationApplier, [this.monacoEditor]);
+    this.addDispose(this.monacoEditor.onDidChangeModel(this.onDidChangeModel.bind(this)));
+    this.addDispose(
+      this.monacoEditor.onDidChangeModelLanguage(() => {
+        this._doUpdateOptions();
+      }),
+    );
+    this.addDispose(
+      this.configurationService.onDidChangeConfiguration((e) => {
+        const changedEditorKeys = Array.from(e.affectedKeys.values()).filter((key) => isEditorOption(key));
+        if (changedEditorKeys.length > 0) {
+          this._doUpdateOptions();
+        }
+      }),
+    );
+  }
+
+  private async onDidChangeModel() {
+    this._editorOptionsFromContribution = {};
+    const uri = this.currentUri;
+    if (uri) {
+      Promise.resolve(this.editorFeatureRegistry.runProvideEditorOptionsForUri(uri)).then((options) => {
+        if (!this.currentUri || !uri.isEqual(this.currentUri)) {
+          return; // uri可能已经变了
+        }
+
+        if (options && Object.keys(options).length > 0) {
+          this._editorOptionsFromContribution = options;
+          if (!isEmptyObject(this._editorOptionsFromContribution)) {
+            this._doUpdateOptions();
+          }
+        }
+      });
+    }
+  }
+
+  public getType() {
+    return this.type;
+  }
+
+  updateOptions(
+    editorOptions: monaco.editor.IEditorOptions = {},
+    modelOptions: monaco.editor.ITextModelUpdateOptions = {},
+  ) {
+    this._specialEditorOptions = removeUndefined({ ...this._specialEditorOptions, ...editorOptions });
+    this._specialModelOptions = removeUndefined({ ...this._specialModelOptions, ...modelOptions });
+    this._doUpdateOptions();
+  }
+
+  private _doUpdateOptions() {
+    const { editorOptions, modelOptions } = this._calculateFinalOptions();
+    updateOptionsWithMonacoEditor(this.monacoEditor, editorOptions, modelOptions);
+  }
+
+  /**
+   * 合并所有的选项
+   * 优先关系: （从高到底）
+   * 1. 当前编辑器的特殊选项（通过调用 updateOptions或者启动时传入）
+   * 2. 来自 featureRegistry 的根据 当前uri 提供的选项
+   * 3. 来自偏好设置的选项
+   */
+  private _calculateFinalOptions() {
+    const uriStr = this.currentUri ? this.currentUri.toString() : undefined;
+    const languageId = this.currentDocumentModel ? this.currentDocumentModel.languageId : undefined;
+    const options = getConvertedMonacoOptions(this.configurationService, uriStr, languageId, undefined);
+    const basicEditorOptions: Partial<monaco.editor.IEditorOptions> = {
+      readOnly: this.currentDocumentModel?.readonly || false,
+    };
+
+    let editorOptions = {
+      ...basicEditorOptions,
+      ...options.editorOptions,
+      ...this._editorOptionsFromContribution,
+      ...this._specialEditorOptions,
+    };
+
+    if (this.type !== EditorType.CODE) {
+      editorOptions = {
+        ...editorOptions,
+        ...options.diffOptions,
+      };
+    }
+
+    return {
+      editorOptions,
+      modelOptions: { ...options.modelOptions, ...this._specialModelOptions },
+    };
+  }
+
+  insertSnippet(template: string, ranges: IRange[], opts: IUndoStopOptions) {
+    insertSnippetWithMonacoEditor(this.monacoEditor, template, ranges, opts);
+  }
+
+  applyDecoration(key: string, options: IDecorationApplyOptions[]) {
+    this.decorationApplier.applyDecoration(key, options);
+  }
+
+  onSelectionsChanged(listener) {
+    return this.monacoEditor.onDidChangeCursorSelection((e) => {
+      if (!this._disableSelectionEmitter) {
+        listener({
+          selections: this.getSelections(),
+          source: e.source,
+        });
+      }
+    });
+  }
+
+  onVisibleRangesChanged(listener) {
+    const disposer = new Disposable();
+    const monacoEditor = this.monacoEditor;
+    disposer.addDispose(
+      monacoEditor.onDidScrollChange((e) => {
+        listener(this.monacoEditor.getVisibleRanges());
+      }),
+    );
+    disposer.addDispose(
+      monacoEditor.onDidLayoutChange((e) => {
+        listener(this.monacoEditor.getVisibleRanges());
+      }),
+    );
+    return disposer;
+  }
+
+  setSelections(selections) {
+    return this.monacoEditor.setSelections(selections as any);
+  }
+
+  setSelection(selection) {
+    return this.monacoEditor.setSelection(selection as any);
+  }
+
+  public async save(): Promise<void> {
+    if (this.currentDocumentModel) {
+      await this.currentDocumentModel.save();
+    }
+  }
+
+  onConfigurationChanged(listener) {
+    const monacoEditor = this.monacoEditor;
+    return monacoEditor.onDidChangeConfiguration((e) => {
+      listener();
+    });
+  }
+}
+
 @Injectable({ multiple: true })
 export class BrowserCodeEditor extends BaseMonacoEditorWrapper implements ICodeEditor {
   @Autowired(EditorCollectionService)
@@ -372,6 +568,9 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
   @Autowired(EditorCollectionService)
   private collectionService: EditorCollectionServiceImpl;
 
+  @Autowired(AppConfig)
+  private appConfig: AppConfig;
+
   private originalDocModelRef: IEditorDocumentModelRef | null;
 
   private modifiedDocModelRef: IEditorDocumentModelRef | null;
@@ -638,6 +837,7 @@ export class BrowserDiffEditor extends WithEventBus implements IDiffEditor {
 }
 
 // utils
+
 function bindPreventNavigation(div: HTMLElement) {
   div.addEventListener('mousewheel', preventNavigation as any);
 }
@@ -653,3 +853,18 @@ function preventNavigation(this: HTMLDivElement, e: WheelEvent) {
     e.stopPropagation();
   }
 }
+
+@Injectable({ multiple: true })
+export class DiffEditorPart extends BaseMonacoEditorWrapper implements IEditor {
+  get currentDocumentModel() {
+    return this.getDocumentModel();
+  }
+
+  constructor(
+    monacoEditor: IMonacoCodeEditor,
+    private getDocumentModel: () => IEditorDocumentModel | null,
+    type: EditorType,
+  ) {
+    super(monacoEditor, type);
+  }
+}

package/src/browser/editor.contribution.ts

@@ -1246,7 +1246,6 @@ export class EditorContribution
           title: string;
           multiDiffSourceUri: UriComponents;
           resources: { originalUri?: UriComponents; modifiedUri?: UriComponents }[];
-          editorOptions?: IResourceOpenOptions;
         }) => {
           const sources: MultiDiffEditorItem[] = [];
           for (const { originalUri, modifiedUri } of options.resources) {
@@ -1263,7 +1262,6 @@ export class EditorContribution
           this.multiDiffResolver.registerSources(multiDiffSourceUri, sources);
           await this.workbenchEditorService.open(multiDiffSourceUri, {
             label: options.title,
-            ...options.editorOptions,
           });
         },
       },

package/src/browser/editor.less

@@ -20,28 +20,3 @@
     }
   }
 }
-
-.monaco-component.multiDiffEditor {
-  & .multiDiffEntry {
-    & .header {
-      margin-top: 8px;
-      .header-content {
-        margin-top: 0;
-      }
-    }
-    .status {
-      &.added {
-        color: var(--gitDecoration-addedResourceForeground);
-      }
-      &.deleted {
-        color: var(--gitDecoration-deletedResourceForeground);
-      }
-      &.renamed {
-        color: var(--gitDecoration-renamedResourceForeground);
-      }
-      &.modified {
-        color: var(--gitDecoration-modifiedResourceForeground);
-      }
-    }
-  }
-}

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

@@ -1,16 +1,6 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import { PreferenceService } from '@opensumi/ide-core-browser';
-import {
-  DisposableStore,
-  Emitter,
-  Event,
-  IDisposable,
-  ILogger,
-  OnEvent,
-  URI,
-  WithEventBus,
-  isString,
-} from '@opensumi/ide-core-common';
+import { DisposableStore, Emitter, IDisposable, ILogger, OnEvent, URI, WithEventBus } from '@opensumi/ide-core-common';
 import {
   ValueWithChangeEventFromObservable,
   constObservable,
@@ -35,14 +25,11 @@ 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 { EditorType, IEditorDocumentModelRef, IResourceOpenOptions } from '../../common/editor';
+import { 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 { 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)
@@ -52,7 +39,7 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
   private readonly messageService: IMessageService;
 
   @Autowired(IEditorDocumentModelService)
-  private readonly documentModelManager: IEditorDocumentModelService;
+  documentModelManager: IEditorDocumentModelService;
 
   @Autowired(PreferenceService)
   private readonly preferenceService: PreferenceService;
@@ -71,13 +58,8 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
 
   private multiDiffModel: IMultiDiffEditorModel & IDisposable;
 
-  constructor(
-    public readonly multiDiffWidget: MultiDiffEditorWidget,
-    private convertedOptions: IConvertedMonacoOptions,
-    private editorCollectionService: EditorCollectionServiceImpl,
-  ) {
+  constructor(private multiDiffWidget: MultiDiffEditorWidget, private convertedOptions: IConvertedMonacoOptions) {
     super();
-    this.editorCollectionService.addMultiDiffEditors([this]);
   }
 
   @OnEvent(EditorDocumentModelContentChangedEvent)
@@ -127,33 +109,7 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
     }
   }
 
-  private createAndRegisterEditorParts(
-    modifiedEditor: { editor: ICodeEditor } | undefined,
-    originalEditor: { editor: ICodeEditor } | undefined,
-    modifiedInstance: any,
-    originalInstance: any,
-  ): void {
-    const editors: DiffEditorPart[] = [];
-    if (modifiedEditor) {
-      const modifiedDiffEditorPart = this.injector.get(DiffEditorPart, [
-        modifiedEditor.editor,
-        () => modifiedInstance,
-        EditorType.MODIFIED_DIFF,
-      ]);
-      editors.push(modifiedDiffEditorPart);
-    }
-    if (originalEditor) {
-      const originalDiffEditorPart = this.injector.get(DiffEditorPart, [
-        originalEditor.editor,
-        () => originalInstance,
-        EditorType.ORIGINAL_DIFF,
-      ]);
-      editors.push(originalDiffEditorPart);
-    }
-    this.editorCollectionService.addEditors(editors);
-  }
-
-  async compareMultiple(editor: IMultiDiffEditor, resource: IResource, options?: IResourceOpenOptions): Promise<void> {
+  async compareMultiple(resource: IResource, options?: IResourceOpenOptions): Promise<void> {
     // Save current view state before changing
     if (this.currentUri) {
       this.saveViewState(this.currentUri);
@@ -168,10 +124,12 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
       this,
       resources,
       async (r, store) => {
+        /** @description documentsWithPromises */
         let original: IEditorDocumentModelRef | undefined;
         let modified: IEditorDocumentModelRef | undefined;
 
         const multiDiffItemStore = new DisposableStore();
+
         try {
           [original, modified] = await Promise.all([
             r.originalUri ? this.documentModelManager.createModelReference(r.originalUri) : undefined,
@@ -194,11 +152,9 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
           multiDiffEditorItem: r,
           original: original?.instance.getMonacoModel(),
           modified: modified?.instance.getMonacoModel(),
-          originalInstance: original?.instance,
-          modifiedInstance: modified?.instance,
           contextKeys: r.contextKeys,
           options: {
-            readOnly: (modified || original)?.instance.readonly,
+            readOnly: modified?.instance.readonly,
             // TODO: codelens，wordWrap options
             ...this.convertedOptions.diffOptions,
           },
@@ -218,6 +174,7 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
     const documents = observableValue<readonly RefCounted<IDocumentDiffItem>[] | 'loading'>('documents', 'loading');
 
     const updateDocuments = derived(async (reader) => {
+      /** @description Update documents */
       const docsPromises = documentsWithPromises.read(reader);
       const docs = await Promise.all(docsPromises);
       const newDocuments = docs.filter((item) => item !== undefined);
@@ -236,49 +193,11 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
     const viewModel = this.multiDiffWidget.createViewModel(this.multiDiffModel);
     await viewModel.waitForDiffs();
     this.multiDiffWidget.setViewModel(viewModel);
-    this.multiDiffWidget.getActiveControl();
 
     // Update current URI and restore view state
     this.currentUri = resource.uri;
     this.restoreViewState(resource.uri);
-    const documentRefs = documents.get();
-    for (const ref of documentRefs) {
-      if (isString(ref)) {
-        continue;
-      }
-      const modified = ref.object.modified;
-      const original = ref.object.original;
-      if (!modified && !original) {
-        continue;
-      }
-      let modifiedEditor = modified ? this.multiDiffWidget.tryGetCodeEditor(modified.uri) : undefined;
-      let originalEditor = original ? this.multiDiffWidget.tryGetCodeEditor(original.uri) : undefined;
-      if (!modifiedEditor && !originalEditor) {
-        const editor = modified || original;
-        if (!editor) {
-          continue;
-        }
-        Event.once(editor.onDidChangeAttached)(() => {
-          setTimeout(() => {
-            modifiedEditor = modified ? this.multiDiffWidget.tryGetCodeEditor(modified.uri) : undefined;
-            originalEditor = original ? this.multiDiffWidget.tryGetCodeEditor(original.uri) : undefined;
-            this.createAndRegisterEditorParts(
-              modifiedEditor,
-              originalEditor,
-              (ref.object as any).modifiedInstance,
-              (ref.object as any).originalInstance,
-            );
-          }, 0);
-        });
-        continue;
-      }
-      this.createAndRegisterEditorParts(
-        modifiedEditor,
-        originalEditor,
-        (ref.object as any).modifiedInstance,
-        (ref.object as any).originalInstance,
-      );
-    }
+
     this.multiDiffModelChangeEmitter.fire(this.multiDiffModel);
   }
 

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

@@ -40,6 +40,7 @@ export class MultiDiffResourceProvider extends WithEventBus implements IResource
     // Get icon from the first modified file
     const firstModifiedUri = parsedSources.length > 0 ? new URI(parsedSources[0].modifiedUri) : undefined;
     const icon = firstModifiedUri ? this.labelService.getIcon(firstModifiedUri) : undefined;
+
     return {
       name: `Multi-Diff: ${name || parsedSources.length + ' files'}`,
       icon: icon || getIcon('diff'),

package/src/browser/workbench-editor.service.ts

@@ -2498,7 +2498,7 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
       });
     }
 
-    await this.multiDiffEditor.compareMultiple(this.multiDiffEditor, resource, options);
+    await this.multiDiffEditor.compareMultiple(resource, options);
   }
 }
 

package/src/common/multi-diff.ts

@@ -10,8 +10,6 @@ import {
 import { IResourceOpenOptions } from './editor';
 import { IResource } from './resource';
 
-import type { MultiDiffEditorWidget } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
-
 export const MULTI_DIFF_SCHEME = 'multi-diff-editor';
 
 export const IMultiDiffSourceResolverService = Symbol('IMultiDiffSourceResolverService');
@@ -60,7 +58,7 @@ export interface IMultiDiffEditor extends IDisposable {
   /**
    * Compare multiple file pairs
    */
-  compareMultiple(editor: IMultiDiffEditor, resource: IResource, options?: IResourceOpenOptions): Promise<void>;
+  compareMultiple(resource: IResource, options?: IResourceOpenOptions): Promise<void>;
 
   /**
    * Get all file pairs currently being compared
@@ -96,9 +94,4 @@ export interface IMultiDiffEditor extends IDisposable {
    * Expand all files
    */
   expandAll(): void;
-
-  /**
-   * Get the multi-diff editor widget
-   */
-  multiDiffWidget: MultiDiffEditorWidget;
 }