feat: line-change of code edits adds change parameter

Author: Ricbet

packages/ai-native/src/browser/contrib/intelligent-completions/source/base.ts

@@ -69,8 +69,6 @@ export abstract class BaseCodeEditsSource extends Disposable {
   private cancellationTokenSource = new CancellationTokenSource();
   private readonly relationID = observableValue<string | undefined>(this, undefined);
 
-  protected abstract doTrigger(...args: any[]): MaybePromise<void>;
-
   public readonly codeEditsContextBean = disposableObservableValue<CodeEditsContextBean | undefined>(this, undefined);
   public abstract priority: number;
   public abstract mount(): IDisposable;

packages/ai-native/src/browser/contrib/intelligent-completions/source/line-change.source.ts

@@ -1,47 +1,102 @@
 import { Injectable } from '@opensumi/di';
 import { AINativeSettingSectionsId, ECodeEditsSourceTyping, IDisposable } from '@opensumi/ide-core-common';
-import { ICursorPositionChangedEvent, Position } from '@opensumi/ide-monaco';
+import { ICursorPositionChangedEvent, IModelContentChangedEvent } from '@opensumi/ide-monaco';
+import {
+  autorunDelta,
+  derivedHandleChanges,
+  observableFromEvent,
+  recomputeInitiallyAndOnChange,
+} from '@opensumi/ide-monaco/lib/common/observable';
 
 import { BaseCodeEditsSource } from './base';
 
 export interface ILineChangeData {
   currentLineNumber: number;
   preLineNumber?: number;
+  change?: IModelContentChangedEvent;
 }
 
 @Injectable({ multiple: true })
 export class LineChangeCodeEditsSource extends BaseCodeEditsSource {
   public priority = 2;
 
-  private prePosition = this.monacoEditor.getPosition();
-
   public mount(): IDisposable {
+    const modelContentChangeObs = observableFromEvent<IModelContentChangedEvent>(
+      this,
+      this.monacoEditor.onDidChangeModelContent,
+      (event: IModelContentChangedEvent) => event,
+    );
+    const positionChangeObs = observableFromEvent<ICursorPositionChangedEvent>(
+      this,
+      this.monacoEditor.onDidChangeCursorPosition,
+      (event: ICursorPositionChangedEvent) => event,
+    );
+
+    const latestModelContentChangeObs = derivedHandleChanges(
+      {
+        owner: this,
+        createEmptyChangeSummary: () => ({ change: undefined }),
+        handleChange: (ctx, changeSummary: { change: IModelContentChangedEvent | undefined }) => {
+          // 如果只是改了光标则设置 change 为空，避免获取到缓存的 change
+          if (ctx.didChange(positionChangeObs)) {
+            changeSummary.change = undefined;
+          } else {
+            changeSummary.change = modelContentChangeObs.get();
+          }
+          return true;
+        },
+      },
+      (reader, changeSummary) => {
+        positionChangeObs.read(reader);
+        modelContentChangeObs.read(reader);
+        return changeSummary.change;
+      },
+    );
+
+    this.addDispose(recomputeInitiallyAndOnChange(latestModelContentChangeObs));
+
+    let lastModelContent: IModelContentChangedEvent | undefined;
     this.addDispose(
-      this.monacoEditor.onDidChangeCursorPosition((event: ICursorPositionChangedEvent) => {
-        const currentPosition = event.position;
-        if (this.prePosition && this.prePosition.lineNumber !== currentPosition.lineNumber) {
-          this.doTrigger(currentPosition);
-          this.prePosition = currentPosition;
-        }
+      /**
+       * 由于 monaco 的 changeModelContent 事件比 changeCursorPosition 事件先触发，所以这里需要拿上一次的值进行消费
+       * 否则永远返回 undefined
+       */
+      autorunDelta(latestModelContentChangeObs, ({ lastValue }) => {
+        lastModelContent = lastValue;
       }),
     );
-    return this;
-  }
 
-  protected doTrigger(position: Position) {
-    const isLineChangeEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLineChange, false);
+    this.addDispose(
+      autorunDelta(positionChangeObs, ({ lastValue, newValue }) => {
+        const contentChange = lastModelContent;
 
-    if (!isLineChangeEnabled || !position) {
-      return;
-    }
+        const isLineChangeEnabled = this.preferenceService.getValid(
+          AINativeSettingSectionsId.CodeEditsLineChange,
+          false,
+        );
+        if (!isLineChangeEnabled) {
+          return false;
+        }
 
-    this.setBean({
-      typing: ECodeEditsSourceTyping.LineChange,
-      position,
-      data: {
-        preLineNumber: this.prePosition?.lineNumber,
-        currentLineNumber: position.lineNumber,
-      },
-    });
+        const prePosition = lastValue?.position;
+        const currentPosition = newValue?.position;
+        if (prePosition && prePosition.lineNumber !== currentPosition?.lineNumber) {
+          this.setBean({
+            typing: ECodeEditsSourceTyping.LineChange,
+            position: currentPosition,
+            data: {
+              preLineNumber: prePosition.lineNumber,
+              currentLineNumber: currentPosition.lineNumber,
+              change: contentChange,
+            },
+          });
+        }
+
+        // 消费完之后设置为 undefined，避免下次获取到缓存的值
+        lastModelContent = undefined;
+      }),
+    );
+
+    return this;
   }
 }