@opensumi/ide-editor 3.9.1-next-1749175927.0 → 3.9.1-next-1749196667.0

package/src/browser/editor.less

@@ -20,3 +20,28 @@
     }
   }
 }
+
+.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/editor.view.tsx

@@ -571,7 +571,7 @@ export const ComponentWrapper = ({ component, resource, hidden, ...other }) => {
         [styles.kt_hidden]: hidden,
       })}
     >
-      <Scrollbars hiddenHorizontal={true}>
+      <Scrollbars>
         <ErrorBoundary>
           <div
             ref={(el) => {

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

@@ -1,6 +1,16 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import { PreferenceService } from '@opensumi/ide-core-browser';
-import { DisposableStore, Emitter, IDisposable, ILogger, OnEvent, URI, WithEventBus } from '@opensumi/ide-core-common';
+import {
+  DisposableStore,
+  Emitter,
+  Event,
+  IDisposable,
+  ILogger,
+  OnEvent,
+  URI,
+  WithEventBus,
+  isString,
+} from '@opensumi/ide-core-common';
 import {
   ValueWithChangeEventFromObservable,
   constObservable,
@@ -25,11 +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 { 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 { 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)
@@ -39,7 +52,7 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
   private readonly messageService: IMessageService;
 
   @Autowired(IEditorDocumentModelService)
-  documentModelManager: IEditorDocumentModelService;
+  private readonly documentModelManager: IEditorDocumentModelService;
 
   @Autowired(PreferenceService)
   private readonly preferenceService: PreferenceService;
@@ -58,8 +71,13 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
 
   private multiDiffModel: IMultiDiffEditorModel & IDisposable;
 
-  constructor(private multiDiffWidget: MultiDiffEditorWidget, private convertedOptions: IConvertedMonacoOptions) {
+  constructor(
+    public readonly multiDiffWidget: MultiDiffEditorWidget,
+    private convertedOptions: IConvertedMonacoOptions,
+    private editorCollectionService: EditorCollectionServiceImpl,
+  ) {
     super();
+    this.editorCollectionService.addMultiDiffEditors([this]);
   }
 
   @OnEvent(EditorDocumentModelContentChangedEvent)
@@ -109,7 +127,33 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
     }
   }
 
-  async compareMultiple(resource: IResource, options?: IResourceOpenOptions): Promise<void> {
+  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> {
     // Save current view state before changing
     if (this.currentUri) {
       this.saveViewState(this.currentUri);
@@ -124,12 +168,10 @@ 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,
@@ -152,9 +194,11 @@ 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?.instance.readonly,
+            readOnly: (modified || original)?.instance.readonly,
             // TODO: codelens，wordWrap options
             ...this.convertedOptions.diffOptions,
           },
@@ -174,7 +218,6 @@ 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);
@@ -193,11 +236,49 @@ 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,7 +40,6 @@ 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(resource, options);
+    await this.multiDiffEditor.compareMultiple(this.multiDiffEditor, resource, options);
   }
 }
 

package/src/common/editor.ts

@@ -367,9 +367,11 @@ export abstract class EditorCollectionService {
   public abstract getEditorByUri(uri: URI): IEditor | undefined;
 
   public abstract listDiffEditors(): IDiffEditor[];
+  public abstract listMultiDiffEditors(): IMultiDiffEditor[];
 
   public abstract onCodeEditorCreate: Event<ICodeEditor>;
   public abstract onDiffEditorCreate: Event<IDiffEditor>;
+  public abstract onMultiDiffEditorCreate: Event<IMultiDiffEditor>;
 }
 
 export type IOpenResourceResult = { group: IEditorGroup; resource: IResource } | false;

package/src/common/multi-diff.ts

@@ -10,6 +10,8 @@ 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');
@@ -58,7 +60,7 @@ export interface IMultiDiffEditor extends IDisposable {
   /**
    * Compare multiple file pairs
    */
-  compareMultiple(resource: IResource, options?: IResourceOpenOptions): Promise<void>;
+  compareMultiple(editor: IMultiDiffEditor, resource: IResource, options?: IResourceOpenOptions): Promise<void>;
 
   /**
    * Get all file pairs currently being compared
@@ -94,4 +96,9 @@ export interface IMultiDiffEditor extends IDisposable {
    * Expand all files
    */
   expandAll(): void;
+
+  /**
+   * Get the multi-diff editor widget
+   */
+  multiDiffWidget: MultiDiffEditorWidget;
 }