@opensumi/ide-editor 3.9.1-next-1749538805.0 → 3.9.1-next-1749540423.0

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

@@ -209,6 +209,11 @@ export enum EditorType {
   MERGE_EDITOR_DIFF = 'MERGE_EDITOR_DIFF',
 }
 
+export interface IEditorDecorationApplier {
+  clearDecorations(): void;
+  applyDecorationFromProvider(): void;
+}
+
 /**
  * 一个 IEditor 代表了一个最小的编辑器单元，可以是 CodeEditor 中的一个，也可以是 DiffEditor 中的两个
  */
@@ -234,6 +239,11 @@ export interface IEditor {
    */
   currentUri: URI | null;
 
+  /**
+   * 装饰器应用器
+   */
+  decorationApplier: IEditorDecorationApplier;
+
   /**
    * 插入代码片段
    * @param template
@@ -275,6 +285,8 @@ export interface IEditor {
   onFocus: Event<void>;
 
   onBlur: Event<void>;
+
+  updateDocumentModel?: (uri: URI) => void;
 }
 
 export interface IUndoStopOptions {
@@ -367,9 +379,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;
 }