@opensumi/ide-ai-native 3.4.4-next-1728985193.0 → 3.4.4

package/src/browser/widget/inline-chat/inline-chat-editor.controller.ts

@@ -83,59 +83,47 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
   mount(): IDisposable {
     this.inlineDiffController = InlineDiffController.get(this.monacoEditor)!;
 
-    this.doContribute();
-    return this;
-  }
-
-  private disposeAllWidget() {
-    [this.aiInlineContentWidget, this.aiInlineChatDisposable, this.aiInlineChatOperationDisposable].forEach(
-      (widget) => {
-        widget?.dispose();
-      },
-    );
-
-    this.inlineChatInUsing = false;
-    this.cancelToken();
-  }
-
-  public doContribute(): IDisposable {
     if (!this.monacoEditor) {
-      return this;
+      return this.featureDisposable;
     }
 
-    const monacoEditor = this.monacoEditor;
-
-    this.disposables.push(
+    this.featureDisposable.addDispose(
       this.aiInlineChatService.onInlineChatVisible((value: boolean) => {
         if (value) {
-          this.showInlineChat(monacoEditor);
+          this.showInlineChat(this.monacoEditor);
         } else {
           this.cancelToken();
           this.disposeAllWidget();
         }
       }),
+    );
+
+    this.featureDisposable.addDispose(
       this.codeActionService.onCodeActionRun(({ id, range }) => {
         const currentEditor = this.workbenchEditorService.currentEditor;
 
         // 可能存在两个 editor 但 uri 是同一个的情况，所以需要根据 editor 的 id 来判断
-        if (currentEditor?.getId() !== monacoEditor!.getId()) {
+        if (currentEditor?.getId() !== this.monacoEditor!.getId()) {
           return;
         }
 
-        monacoEditor.setSelection(range);
-        this.showInlineChat(monacoEditor);
+        this.monacoEditor.setSelection(range);
+        this.showInlineChat(this.monacoEditor);
         if (this.aiInlineContentWidget) {
           this.aiInlineContentWidget.clickActionId(id, 'codeAction');
         }
       }),
-      monacoEditor.onWillChangeModel(() => {
+    );
+
+    this.featureDisposable.addDispose(
+      this.monacoEditor.onWillChangeModel(() => {
         this.disposeAllWidget();
       }),
     );
 
     let needShowInlineChat = false;
-    this.disposables.push(
-      monacoEditor.onMouseDown((event: monaco.IEditorMouseEvent) => {
+    this.featureDisposable.addDispose(
+      this.monacoEditor.onMouseDown((event: monaco.IEditorMouseEvent) => {
         const target = event.target;
         const detail = (target as any).detail;
 
@@ -149,7 +137,10 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
           this.disposeAllWidget();
         }
       }),
-      monacoEditor.onMouseUp((event: monaco.IEditorMouseEvent) => {
+    );
+
+    this.featureDisposable.addDispose(
+      this.monacoEditor.onMouseUp((event: monaco.IEditorMouseEvent) => {
         const target = event.target;
         const detail = (target as any).detail;
         if (detail && typeof detail === 'string' && detail === AIInlineChatContentWidgetId) {
@@ -164,7 +155,7 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
       AINativeSettingSectionsId.InlineChatAutoVisible,
       true,
     );
-    this.disposables.push(
+    this.featureDisposable.addDispose(
       this.preferenceService.onSpecificPreferenceChange(
         AINativeSettingSectionsId.InlineChatAutoVisible,
         ({ newValue }) => {
@@ -173,9 +164,9 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
       ),
     );
 
-    this.disposables.push(
+    this.featureDisposable.addDispose(
       Event.debounce(
-        Event.any<any>(monacoEditor.onDidChangeCursorSelection, monacoEditor.onMouseUp),
+        Event.any<any>(this.monacoEditor.onDidChangeCursorSelection, this.monacoEditor.onMouseUp),
         (_, e) => e,
         100,
       )(() => {
@@ -189,11 +180,22 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
           return;
         }
 
-        this.showInlineChat(monacoEditor);
+        this.showInlineChat(this.monacoEditor);
       }),
     );
 
-    return this;
+    return this.featureDisposable;
+  }
+
+  private disposeAllWidget() {
+    [this.aiInlineContentWidget, this.aiInlineChatDisposable, this.aiInlineChatOperationDisposable].forEach(
+      (widget) => {
+        widget?.dispose();
+      },
+    );
+
+    this.inlineChatInUsing = false;
+    this.cancelToken();
   }
 
   protected showInlineContentWidget(monacoEditor: monaco.ICodeEditor, selection: monaco.Selection): void {

package/src/browser/widget/inline-diff/inline-diff-previewer.ts

@@ -19,10 +19,6 @@ import { InlineDiffWidget } from './inline-diff-widget';
 
 export interface IDiffPreviewerOptions {
   disposeWhenEditorClosed: boolean;
-  /**
-   * 是否隐藏接受部分编辑的 widget，用于只展示 diff 的场景
-   */
-  hideAcceptPartialEditWidget?: boolean;
 }
 
 export interface IInlineDiffPreviewerNode extends IDisposable {

package/src/browser/widget/inline-diff/inline-diff.controller.ts

@@ -53,7 +53,7 @@ export class InlineDiffController extends BaseAIMonacoEditorController {
   private _previewerNodeStore = new Map<string, InlineStreamDiffHandler | null>();
 
   mount(): IDisposable {
-    this.registerDispose(
+    this.featureDisposable.addDispose(
       this.eventBus.on(EditorGroupCloseEvent, (e: EditorGroupCloseEvent) => {
         const uriString = e.payload.resource.uri.toString();
         const node = this.getStoredState(uriString);
@@ -66,7 +66,7 @@ export class InlineDiffController extends BaseAIMonacoEditorController {
 
     this.registerInlineDiffFeature(this.monacoEditor);
 
-    return this;
+    return this.featureDisposable;
   }
 
   storeState(key: string) {
@@ -110,12 +110,10 @@ export class InlineDiffController extends BaseAIMonacoEditorController {
     }
   }
 
-  registerInlineDiffFeature(monacoEditor: monaco.ICodeEditor): IDisposable {
-    const disposable = new Disposable();
-
+  registerInlineDiffFeature(monacoEditor: monaco.ICodeEditor): void {
     const model = monacoEditor.getModel();
 
-    disposable.addDispose(
+    this.featureDisposable.addDispose(
       monacoEditor.onWillChangeModel((e) => {
         if (!e.oldModelUrl) {
           return;
@@ -128,7 +126,7 @@ export class InlineDiffController extends BaseAIMonacoEditorController {
       }),
     );
 
-    disposable.addDispose(
+    this.featureDisposable.addDispose(
       monacoEditor.onDidChangeModel((e) => {
         if (!e.newModelUrl) {
           return;
@@ -138,15 +136,13 @@ export class InlineDiffController extends BaseAIMonacoEditorController {
     );
 
     if (model) {
-      disposable.addDispose(
+      this.featureDisposable.addDispose(
         model.onWillDispose(() => {
           const uriString = model.uri.toString();
           this.destroyPreviewer(uriString);
         }),
       );
     }
-
-    return disposable;
   }
 
   showPreviewerByStream(

package/src/browser/widget/inline-hint/inline-hint.controller.ts

@@ -76,14 +76,14 @@ export class InlineHintController extends BaseAIMonacoEditorController {
       }
     };
 
-    this.addDispose(
+    this.featureDisposable.addDispose(
       monacoEditor.onDidChangeCursorPosition((e: monaco.editor.ICursorPositionChangedEvent) => {
         hideHint();
         showHint(e.position);
       }),
     );
 
-    this.addDispose(
+    this.featureDisposable.addDispose(
       monacoEditor.onDidFocusEditorWidget(() => {
         const currentPosition = monacoEditor.getPosition();
 
@@ -94,13 +94,13 @@ export class InlineHintController extends BaseAIMonacoEditorController {
       }),
     );
 
-    this.addDispose(
+    this.featureDisposable.addDispose(
       monacoEditor.onDidBlurEditorWidget(() => {
         hideHint();
       }),
     );
 
-    this.addDispose(
+    this.featureDisposable.addDispose(
       this.inlineCompletionsService.onVisibleCompletion((v) => {
         if (v) {
           hideHint();
@@ -108,8 +108,8 @@ export class InlineHintController extends BaseAIMonacoEditorController {
       }),
     );
 
-    this.addDispose(hintDisposable);
+    this.featureDisposable.addDispose(hintDisposable);
 
-    return this;
+    return this.featureDisposable;
   }
 }

package/src/browser/widget/inline-input/inline-input.controller.ts

@@ -133,7 +133,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
       inputDisposable.dispose();
     };
 
-    this.addDispose(
+    this.featureDisposable.addDispose(
       this.inlineInputChatService.onInteractiveInputVisibleInPosition((position) => {
         hideInput();
 
@@ -144,7 +144,7 @@ export class InlineInputController extends BaseAIMonacoEditorController {
     );
 
     const showInput = (position: monaco.Position, monacoEditor: ICodeEditor) => {
-      this.addDispose(
+      this.featureDisposable.addDispose(
         monacoEditor.onWillChangeModel(() => {
           hideInput();
         }),
@@ -270,8 +270,8 @@ export class InlineInputController extends BaseAIMonacoEditorController {
       inputDisposable.addDispose(inlineInputChatWidget);
     };
 
-    this.addDispose(inputDisposable);
+    this.featureDisposable.addDispose(inputDisposable);
 
-    return this;
+    return this.featureDisposable;
   }
 }

package/src/browser/widget/inline-stream-diff/inline-stream-diff.handler.tsx

@@ -101,12 +101,6 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
 
   setPreviewerOptions(options: IDiffPreviewerOptions): void {
     this.previewerOptions = options;
-
-    this.livePreviewDiffDecorationModel.setPreviewerOptions({
-      partialEditWidgetOptions: {
-        hideAcceptPartialEditWidget: options.hideAcceptPartialEditWidget,
-      },
-    });
   }
 
   initialize(selection: Selection): void {

package/src/browser/widget/inline-stream-diff/live-preview.component.tsx

@@ -124,13 +124,6 @@ const PartialEditComponent = (props: {
   );
 };
 
-export interface IPartialEditWidgetOptions {
-  /**
-   * In some case, we don't want to show the accept and reject button
-   */
-  hideAcceptPartialEditWidget?: boolean;
-}
-
 @Injectable({ multiple: true })
 export class AcceptPartialEditWidget extends ReactInlineContentWidget {
   static ID = 'AcceptPartialEditWidgetID';
@@ -149,10 +142,6 @@ export class AcceptPartialEditWidget extends ReactInlineContentWidget {
 
   positionPreference = [ContentWidgetPositionPreference.EXACT];
 
-  constructor(protected readonly editor: ICodeEditor, protected editWidgetOptions?: IPartialEditWidgetOptions) {
-    super(editor);
-  }
-
   public addedLinesCount: number = 0;
   public deletedLinesCount: number = 0;
   public status: IWidgetStatus = 'pending';
@@ -177,10 +166,6 @@ export class AcceptPartialEditWidget extends ReactInlineContentWidget {
   }
 
   public renderView(): React.ReactNode {
-    if (this.editWidgetOptions?.hideAcceptPartialEditWidget) {
-      return;
-    }
-
     const keyStrings = this.getSequenceKeyStrings();
     if (!keyStrings) {
       return;

package/src/browser/widget/inline-stream-diff/live-preview.decoration.tsx

@@ -29,7 +29,6 @@ import {
   AddedRangeDecoration,
   EPartialEdit,
   IPartialEditEvent,
-  IPartialEditWidgetOptions,
   IRemovedWidgetState,
   IRemovedZoneWidgetOptions,
   ITextLinesTokens,
@@ -54,10 +53,6 @@ export interface ITotalCodeInfo {
   unresolvedChangedLinesCount: number;
 }
 
-export interface IModelOptions {
-  partialEditWidgetOptions?: IPartialEditWidgetOptions;
-}
-
 @Injectable({ multiple: true })
 export class LivePreviewDiffDecorationModel extends Disposable {
   @Autowired(INJECTOR_TOKEN)
@@ -81,16 +76,12 @@ export class LivePreviewDiffDecorationModel extends Disposable {
   public readonly onPartialEditWidgetListChange: Event<AcceptPartialEditWidget[]> =
     this._onPartialEditWidgetListChange.event;
 
-  protected options: IModelOptions = {
-    partialEditWidgetOptions: {},
-  };
-
   protected model: ITextModel;
 
   // Parts that require snapshots
   private addedRangeDec: EnhanceDecorationsCollection;
   private partialEditWidgetList: AcceptPartialEditWidget[] = [];
-  private removedZoneWidgets: RemovedZoneWidget[] = [];
+  private removedZoneWidgets: Array<RemovedZoneWidget> = [];
   private zone: LineRange;
 
   constructor(private readonly monacoEditor: ICodeEditor) {
@@ -515,29 +506,17 @@ export class LivePreviewDiffDecorationModel extends Disposable {
     return newElement;
   }
 
-  static computeCodeInfo(
-    partialEditWidgetList: AcceptPartialEditWidget[],
-    addedDecList: IEnhanceModelDeltaDecoration[],
-    removedWidgetList: RemovedZoneWidget[],
-  ): ITotalCodeInfo {
-    // 代码除了新增和删除行，还需要统计变更行
-    // 1. 新增 N 行 => N
-    // 2. 删除 N 行 => N
-    // 3. 新增 M 行，删除 N 行 => max(M, N)
-    // 综上所述，变更行数 = sum(list.map(item => max(新增行数, 删除行数)))
-    const resolvedStatus = caculate(partialEditWidgetList);
-    const unresolvedStatus = { added: 0, deleted: 0, changed: 0 };
-    partialEditWidgetList.forEach((v, idx) => {
-      if (v.status === 'pending') {
-        const addedDec = addedDecList[idx];
-        const removedWidget = removedWidgetList[idx];
-        const addedLinesCount = addedDec?.length || 0;
-        const deletedLinesCount = removedWidget?.height || 0;
-        unresolvedStatus.added += addedLinesCount;
-        unresolvedStatus.deleted += deletedLinesCount;
-        unresolvedStatus.changed += Math.max(addedLinesCount, deletedLinesCount);
-      }
-    });
+  /**
+   * 获取当前编辑器的代码采纳状态
+   * 1. 已经采纳的代码信息
+   * 2. 还未处理的代码信息
+   */
+  getTotalCodeInfo(): ITotalCodeInfo {
+    const resolvedList = this.partialEditWidgetList.filter((w) => w.isAccepted);
+    const unresolvedList = this.partialEditWidgetList.filter((w) => w.isPending);
+
+    const resolvedStatus = caculate(resolvedList);
+    const unresolvedStatus = caculate(unresolvedList);
 
     return {
       totalAddedLinesCount: resolvedStatus.added,
@@ -548,6 +527,11 @@ export class LivePreviewDiffDecorationModel extends Disposable {
       unresolvedChangedLinesCount: unresolvedStatus.changed,
     };
 
+    // 代码除了新增和删除行，还需要统计变更行
+    // 1. 新增 N 行 => N
+    // 2. 删除 N 行 => N
+    // 3. 新增 M 行，删除 N 行 => max(M, N)
+    // 综上所述，变更行数 = sum(list.map(item => max(新增行数, 删除行数)))
     function caculate(list: AcceptPartialEditWidget[]) {
       const result = { added: 0, deleted: 0, changed: 0 };
       list.forEach((widget) => {
@@ -561,19 +545,6 @@ export class LivePreviewDiffDecorationModel extends Disposable {
     }
   }
 
-  /**
-   * 获取当前编辑器的代码采纳状态
-   * 1. 已经采纳的代码信息
-   * 2. 还未处理的代码信息
-   */
-  getTotalCodeInfo(): ITotalCodeInfo {
-    const partialEditWidgetList = this.partialEditWidgetList;
-    const addedDecList = this.addedRangeDec.getDecorations();
-    const removedWidgetList = this.removedZoneWidgets;
-
-    return LivePreviewDiffDecorationModel.computeCodeInfo(partialEditWidgetList, addedDecList, removedWidgetList);
-  }
-
   /**
    * 记录 partial edit widget 与 added range 的映射关系(主要用于位置计算)
    */
@@ -604,10 +575,7 @@ export class LivePreviewDiffDecorationModel extends Disposable {
   }
 
   private createPartialEditWidget(lineNumber: number): AcceptPartialEditWidget {
-    const acceptPartialEditWidget = this.injector.get(AcceptPartialEditWidget, [
-      this.monacoEditor,
-      this.options.partialEditWidgetOptions,
-    ]);
+    const acceptPartialEditWidget = this.injector.get(AcceptPartialEditWidget, [this.monacoEditor]);
     acceptPartialEditWidget.show({ position: { lineNumber, column: 1 } });
 
     const disposable = acceptPartialEditWidget.onDispose(() => {
@@ -734,8 +702,4 @@ export class LivePreviewDiffDecorationModel extends Disposable {
       }
     }
   }
-
-  setPreviewerOptions(options: IModelOptions) {
-    this.options = options;
-  }
 }