feat: support code edits keybinding (#4362)

* feat: support code edits keybinding

* fix: when

* chore: improve command

Author: Ricbet

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

@@ -1,19 +1,18 @@
 import { Autowired } from '@opensumi/di';
 import {
+  AINativeConfigService,
   ClientAppContribution,
   Key,
   KeybindingContribution,
   KeybindingRegistry,
   KeybindingScope,
 } from '@opensumi/ide-core-browser';
-import {
-  AI_MULTI_LINE_COMPLETION_ACCEPT,
-  AI_MULTI_LINE_COMPLETION_DISCARD,
-} from '@opensumi/ide-core-browser/lib/ai-native/command';
+import { AI_CODE_EDITS_COMMANDS } from '@opensumi/ide-core-browser/lib/ai-native/command';
 import { MultiLineEditsIsVisible } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
 import { CommandContribution, CommandRegistry, Domain } from '@opensumi/ide-core-common';
 import { WorkbenchEditorService } from '@opensumi/ide-editor';
 import { WorkbenchEditorServiceImpl } from '@opensumi/ide-editor/lib/browser/workbench-editor.service';
+import { transaction } from '@opensumi/ide-monaco/lib/common/observable';
 
 import { IntelligentCompletionsController } from './intelligent-completions.controller';
 
@@ -22,8 +21,11 @@ export class IntelligentCompletionsContribution implements KeybindingContributio
   @Autowired(WorkbenchEditorService)
   private readonly workbenchEditorService: WorkbenchEditorServiceImpl;
 
+  @Autowired(AINativeConfigService)
+  private readonly aiNativeConfigService: AINativeConfigService;
+
   registerCommands(commands: CommandRegistry): void {
-    commands.registerCommand(AI_MULTI_LINE_COMPLETION_DISCARD, {
+    commands.registerCommand(AI_CODE_EDITS_COMMANDS.DISCARD, {
       execute: () => {
         const editor = this.workbenchEditorService.currentCodeEditor;
         if (editor) {
@@ -32,31 +34,50 @@ export class IntelligentCompletionsContribution implements KeybindingContributio
       },
     });
 
-    commands.registerCommand(AI_MULTI_LINE_COMPLETION_ACCEPT, {
+    commands.registerCommand(AI_CODE_EDITS_COMMANDS.ACCEPT, {
       execute: () => {
         const editor = this.workbenchEditorService.currentCodeEditor;
         if (editor) {
           IntelligentCompletionsController.get(editor.monacoEditor)?.accept.get();
         }
       },
     });
+
+    commands.registerCommand(AI_CODE_EDITS_COMMANDS.TRIGGER, {
+      execute: () => {
+        const editor = this.workbenchEditorService.currentCodeEditor;
+        if (editor) {
+          transaction((tx) => {
+            IntelligentCompletionsController.get(editor.monacoEditor)?.trigger(tx);
+          });
+        }
+      },
+    });
   }
 
   registerKeybindings(keybindings: KeybindingRegistry): void {
+    const { codeEdits } = this.aiNativeConfigService;
+
     keybindings.registerKeybinding({
-      command: AI_MULTI_LINE_COMPLETION_DISCARD.id,
+      command: AI_CODE_EDITS_COMMANDS.DISCARD.id,
       keybinding: Key.ESCAPE.code,
       when: MultiLineEditsIsVisible.raw,
       priority: 100,
     });
 
     keybindings.registerKeybinding(
       {
-        command: AI_MULTI_LINE_COMPLETION_ACCEPT.id,
+        command: AI_CODE_EDITS_COMMANDS.ACCEPT.id,
         keybinding: Key.TAB.code,
         when: MultiLineEditsIsVisible.raw,
       },
       KeybindingScope.USER,
     );
+
+    keybindings.registerKeybinding({
+      command: AI_CODE_EDITS_COMMANDS.TRIGGER.id,
+      keybinding: codeEdits.triggerKeybinding,
+      when: 'editorFocus',
+    });
   }
 }

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

@@ -13,10 +13,13 @@ import {
 import { Emitter, ICodeEditor, ICursorPositionChangedEvent, IRange, ITextModel, Range } from '@opensumi/ide-monaco';
 import {
   IObservable,
+  IObservableSignal,
   ISettableObservable,
+  ITransaction,
   autorun,
   autorunWithStoreHandleChanges,
   derived,
+  observableSignal,
   observableValue,
   transaction,
 } from '@opensumi/ide-monaco/lib/common/observable';
@@ -85,11 +88,13 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
   private aiNativeContextKey: AINativeContextKey;
   private rewriteWidget: RewriteWidget | null;
   private whenMultiLineEditsVisibleDisposable: Disposable;
+  private codeEditsTriggerSignal: IObservableSignal<void>;
 
   public mount(): IDisposable {
     this.handlerAlwaysVisiblePreference();
 
     this.codeEditsResult = observableValue<CodeEditsResultValue | undefined>(this, undefined);
+    this.codeEditsTriggerSignal = observableSignal(this);
 
     this.whenMultiLineEditsVisibleDisposable = new Disposable();
     this.multiLineDecorationModel = new MultiLineDecorationModel(this.monacoEditor);
@@ -393,6 +398,10 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
     this.hide();
   });
 
+  public trigger(tx: ITransaction): void {
+    this.codeEditsTriggerSignal.trigger(tx);
+  }
+
   private registerFeature(monacoEditor: ICodeEditor): void {
     this.featureDisposable.addDispose(
       Event.any<any>(
@@ -432,16 +441,19 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
       autorunWithStoreHandleChanges(
         {
           createEmptyChangeSummary: () => ({}),
-          handleChange: (context, changeSummary) => {
+          handleChange: (context) => {
             if (context.didChange(this.codeEditsSourceCollection.codeEditsContextBean)) {
               // 如果上一次补全结果还在，则不重复请求
               const isVisible = this.aiNativeContextKey.multiLineEditsIsVisible.get();
               return !isVisible;
+            } else if (context.didChange(this.codeEditsTriggerSignal)) {
+              return true;
             }
             return false;
           },
         },
         async (reader, _, store) => {
+          this.codeEditsTriggerSignal.read(reader);
           const context = this.codeEditsSourceCollection.codeEditsContextBean.read(reader);
 
           const provider = this.intelligentCompletionsRegistry.getCodeEditsProvider();

packages/core-browser/src/ai-native/ai-config.service.ts

@@ -1,5 +1,10 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import { IAINativeCapabilities, IAINativeConfig, IAINativeInlineChatConfig } from '@opensumi/ide-core-common';
+import {
+  IAINativeCapabilities,
+  IAINativeCodeEditsConfig,
+  IAINativeConfig,
+  IAINativeInlineChatConfig,
+} from '@opensumi/ide-core-common';
 
 import { AILogoAvatar } from '../components/ai-native';
 import { LayoutViewSizeConfig } from '../layout/constants';
@@ -28,6 +33,10 @@ const DEFAULT_INLINE_CHAT_CONFIG: Required<IAINativeInlineChatConfig> = {
   logo: AILogoAvatar,
 };
 
+const DEFAULT_CODE_EDITS_CONFIG: Required<IAINativeCodeEditsConfig> = {
+  triggerKeybinding: 'alt+\\',
+};
+
 @Injectable()
 export class AINativeConfigService implements IAINativeConfig {
   @Autowired(AppConfig)
@@ -40,6 +49,7 @@ export class AINativeConfigService implements IAINativeConfig {
 
   private internalCapabilities = DEFAULT_CAPABILITIES;
   private internalInlineChat = DEFAULT_INLINE_CHAT_CONFIG;
+  private internalCodeEdits = DEFAULT_CODE_EDITS_CONFIG;
 
   public get capabilities(): Required<IAINativeCapabilities> {
     if (!this.aiModuleLoaded) {
@@ -65,6 +75,16 @@ export class AINativeConfigService implements IAINativeConfig {
     return this.internalInlineChat;
   }
 
+  public get codeEdits(): Required<IAINativeCodeEditsConfig> {
+    const { AINativeConfig } = this.appConfig;
+
+    if (AINativeConfig?.codeEdits) {
+      return { ...this.internalCodeEdits, ...AINativeConfig.codeEdits };
+    }
+
+    return this.internalCodeEdits;
+  }
+
   setAINativeModuleLoaded(value: boolean): void {
     this.aiModuleLoaded = value;
   }

packages/core-browser/src/ai-native/command.ts

@@ -30,10 +30,16 @@ export const AI_CODE_ACTION = {
   id: 'ai.code.action',
 };
 
-export const AI_MULTI_LINE_COMPLETION_DISCARD = {
-  id: 'ai.multiLine.completion.discard',
-};
-
-export const AI_MULTI_LINE_COMPLETION_ACCEPT = {
-  id: 'ai.multiLine.completion.accept',
-};
+export namespace AI_CODE_EDITS_COMMANDS {
+  export const DISCARD = {
+    id: 'ai.codeEdits.discard',
+  };
+
+  export const ACCEPT = {
+    id: 'ai.codeEdits.accept',
+  };
+
+  export const TRIGGER = {
+    id: 'ai.codeEdits.trigger',
+  };
+}

packages/core-common/src/types/ai-native/index.ts

@@ -81,6 +81,13 @@ export interface IAINativeInlineChatConfig {
   logo?: string | React.ReactNode | React.ComponentType<any>;
 }
 
+export interface IAINativeCodeEditsConfig {
+  /**
+   * 触发 code edits 的快捷键
+   */
+  triggerKeybinding?: string;
+}
+
 export interface IAINativeConfig {
   capabilities?: IAINativeCapabilities;
   /**
@@ -91,6 +98,10 @@ export interface IAINativeConfig {
    * inline chat 配置
    */
   inlineChat?: IAINativeInlineChatConfig;
+  /**
+   * code edits 配置
+   */
+  codeEdits?: IAINativeCodeEditsConfig;
 }
 
 export enum ECompletionType {