Merge branch 'v3.1'

Author: bytemain

lerna.json

@@ -1,4 +1,4 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.1.1"
+  "version": "3.1.2"
 }

packages/addons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-addons",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "files": [
     "lib",
     "src"

packages/ai-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-ai-native",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "files": [
     "lib",
     "src"

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

@@ -53,6 +53,7 @@ import { IMainLayoutService } from '@opensumi/ide-main-layout';
 import { Position } from '@opensumi/ide-monaco';
 import { ISettingRegistry, SettingContribution } from '@opensumi/ide-preferences';
 import { EditorContributionInstantiation } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorExtensions';
+import { HideInlineCompletion } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/inlineCompletions/browser/commands';
 
 import {
   AI_CHAT_CONTAINER_ID,
@@ -351,14 +352,19 @@ export class AINativeBrowserContribution
     commands.registerCommand(AI_INLINE_COMPLETION_VISIBLE, {
       execute: async (visible: boolean) => {
         if (!visible) {
-          await this.commandService.executeCommand('editor.action.inlineSuggest.hide');
           this.aiCompletionsService.hideStatusBarItem();
-          this.aiInlineCompletionsProvider.resetContextKey();
           this.aiInlineCompletionsProvider.cancelRequest();
           this.aiCompletionsService.setVisibleCompletion(false);
         }
       },
     });
+
+    /**
+     * 当 inline completion 消失时
+     */
+    commands.afterExecuteCommand(HideInlineCompletion.ID, () => {
+      this.commandService.executeCommand(AI_INLINE_COMPLETION_VISIBLE.id, false);
+    });
   }
 
   registerRenderer(registry: SlotRendererRegistry): void {

packages/ai-native/src/browser/contrib/inline-completions/completeProvider.ts

@@ -1,14 +1,20 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import { PreferenceService } from '@opensumi/ide-core-browser';
 import { AI_INLINE_COMPLETION_REPORTER } from '@opensumi/ide-core-browser/lib/ai-native/command';
-import { AINativeSettingSectionsId, DisposableStore, URI, WithEventBus, sleep, uuid } from '@opensumi/ide-core-common';
+import {
+  AINativeSettingSectionsId,
+  DisposableStore,
+  URI,
+  WithEventBus,
+  raceCancellation,
+  sleep,
+  uuid,
+} from '@opensumi/ide-core-common';
 import { IAICompletionResultModel } from '@opensumi/ide-core-common/lib/types/ai-native';
 import { AISerivceType, IAIReporter } from '@opensumi/ide-core-common/lib/types/ai-native/reporter';
 import { IEditor } from '@opensumi/ide-editor';
 import * as monaco from '@opensumi/ide-monaco';
 
-import { AINativeContextKey } from '../../contextkey/ai-native.contextkey.service';
-
 import { DEFAULT_COMPLECTION_MODEL } from './constants';
 import { CompletionRequestBean, IInlineCompletionCache, InlineCompletionItem } from './model/competionModel';
 import { PromptCache } from './promptCache';
@@ -159,9 +165,6 @@ export class CompletionRequestTask {
 
     // 组装请求参数,向远程发起请求
     const completionRequestBean = await this.constructRequestBean(context, token);
-    if (token.isCancellationRequested) {
-      return [];
-    }
     if (this.isCancelFlag) {
       return [];
     }
@@ -171,9 +174,10 @@ export class CompletionRequestTask {
 
     let rs: IAICompletionResultModel | null;
     const cacheData = this.promptCache.getCache(completionRequestBean.prompt);
-    const relationId = this.aiReporter.start(AISerivceType.Completion, { message: AISerivceType.Completion });
-    this.aiCompletionsService.setLastRelationId(relationId);
+    const relationId =
+      cacheData?.relationId || this.aiReporter.start(AISerivceType.Completion, { message: AISerivceType.Completion });
 
+    this.aiCompletionsService.setLastRelationId(relationId);
     // 如果存在缓存
     if (cacheData) {
       rs = cacheData;
@@ -200,7 +204,7 @@ export class CompletionRequestTask {
     this.aiCompletionsService.setLastSessionId(rs.sessionId);
 
     // 如果是取消直接返回
-    if ((rs && rs.isCancel) || this.isCancelFlag) {
+    if ((rs && rs.isCancel) || token.isCancellationRequested || this.isCancelFlag) {
       this.aiCompletionsService.reporterEnd(relationId, {
         success: true,
         replytime: Date.now() - requestStartTime,
@@ -212,7 +216,7 @@ export class CompletionRequestTask {
     }
 
     if (rs && rs.codeModelList && rs.codeModelList.length > 0) {
-      this.promptCache.setCache(completionRequestBean.prompt, rs);
+      this.promptCache.setCache(completionRequestBean.prompt, { ...rs, relationId });
     }
     // 返回补全结果为空直接返回
     if (rs.codeModelList.length === 0) {
@@ -266,6 +270,7 @@ export class CompletionRequestTask {
           position.column + insertText.length + textAfterCursor.length,
         ),
         sessionId: rs.sessionId,
+        relationId,
         command: {
           id: AI_INLINE_COMPLETION_REPORTER.id,
           title: '',
@@ -323,8 +328,6 @@ export class AIInlineCompletionsProvider extends WithEventBus {
   @Autowired(PreferenceService)
   private readonly preferenceService: PreferenceService;
 
-  private aiNativeContextKey: AINativeContextKey;
-
   /**
    * 该补全是否是手动触发
    */
@@ -353,8 +356,6 @@ export class AIInlineCompletionsProvider extends WithEventBus {
   }
 
   public mountEditor(editor: IEditor): void {
-    this.aiNativeContextKey = this.injector.get(AINativeContextKey, [(editor.monacoEditor as any)._contextKeyService]);
-
     this.isManual = false;
     this.isDelEvent = false;
     this.reqStack = new ReqStack();
@@ -367,10 +368,6 @@ export class AIInlineCompletionsProvider extends WithEventBus {
     }
   }
 
-  resetContextKey() {
-    this.aiNativeContextKey.inlineCompletionIsTrigger.reset();
-  }
-
   /**
    * 用户触发编辑器后，事件的回调
    * @param document
@@ -385,8 +382,6 @@ export class AIInlineCompletionsProvider extends WithEventBus {
     context: monaco.languages.InlineCompletionContext,
     token: monaco.CancellationToken,
   ) {
-    this.aiNativeContextKey.inlineCompletionIsTrigger.set(true);
-
     // bugfix: 修复当鼠标移动到代码补全上会触发一次手势事件，增加防抖，当手势触发后，能够防抖一次
     if (context.triggerKind === monaco.InlineCompletionTriggerKind.Automatic) {
       if (
@@ -412,20 +407,19 @@ export class AIInlineCompletionsProvider extends WithEventBus {
     // 重置防止不触发自动补全事件
     this.updateIsManual(false);
 
-    // 如果用户已取消
-    if (token?.isCancellationRequested) {
-      this.aiCompletionsService.updateStatusBarItem('cancelled ', false);
-      return undefined;
-    }
-
     // 放入队列
     const requestImp = this.injector.get(CompletionRequestTask, [model, position, token, _isManual]);
 
     this.reqStack.addReq(requestImp);
 
     // 如果是自动补全需要 debounce
     if (!_isManual) {
-      await sleep(this.inlineComletionsDebounceTime);
+      await raceCancellation(sleep(this.inlineComletionsDebounceTime), token);
+    }
+
+    // 如果用户已取消
+    if (token?.isCancellationRequested) {
+      return undefined;
     }
 
     const list = await this.reqStack.runReq();

packages/ai-native/src/browser/contrib/inline-completions/inline-completions.handler.ts

@@ -2,9 +2,13 @@ import debounce from 'lodash/debounce';
 
 import { Autowired, Injectable } from '@opensumi/di';
 import { IDisposable } from '@opensumi/ide-core-browser';
-import { Disposable, IEventBus, Sequencer } from '@opensumi/ide-core-common';
+import { AI_INLINE_COMPLETION_VISIBLE } from '@opensumi/ide-core-browser/lib/ai-native/command';
+import { CommandServiceImpl, Disposable, IEventBus, Sequencer, runWhenIdle } from '@opensumi/ide-core-common';
+import { CommandRegistry, CommandRegistryImpl, CommandService } from '@opensumi/ide-core-common';
 import { EditorSelectionChangeEvent, IEditor } from '@opensumi/ide-editor/lib/browser';
+import { InlineCompletions, Position, Range } from '@opensumi/ide-monaco';
 import { monacoApi } from '@opensumi/ide-monaco/lib/browser/monaco-api';
+import { InlineCompletionContextKeys } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
 
 import { IAIMiddleware } from '../../types';
 import { IAIMonacoContribHandler } from '../base';
@@ -17,12 +21,21 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
   @Autowired(IEventBus)
   private eventBus: IEventBus;
 
+  @Autowired(CommandService)
+  private commandService: CommandServiceImpl;
+
+  @Autowired(CommandRegistry)
+  private commandRegistry: CommandRegistryImpl;
+
   @Autowired(AIInlineCompletionsProvider)
   private readonly aiInlineCompletionsProvider: AIInlineCompletionsProvider;
 
   @Autowired(AICompletionsService)
   private aiCompletionsService: AICompletionsService;
 
+  private sequencer = new Sequencer();
+  private preDidShowItems: InlineCompletions | undefined;
+
   public registerInlineCompletionFeature(editor: IEditor): IDisposable {
     const { monacoEditor } = editor;
     // 判断用户是否选择了一块区域或者移动光标 取消掉请补全求
@@ -37,9 +50,6 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
       if (selection.startLineNumber !== selection.endLineNumber || selection.startColumn !== selection.endColumn) {
         this.aiInlineCompletionsProvider.cancelRequest();
       }
-      requestAnimationFrame(() => {
-        this.aiCompletionsService.setVisibleCompletion(false);
-      });
     };
 
     const debouncedSelectionChange = debounce(selectionChange, 50, {
@@ -68,12 +78,8 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
           }
         }
       }),
-      monacoEditor.onWillChangeModel(() => {
-        this.aiCompletionsService.hideStatusBarItem();
-      }),
       monacoEditor.onDidBlurEditorText(() => {
-        this.aiCompletionsService.hideStatusBarItem();
-        this.aiCompletionsService.setVisibleCompletion(false);
+        this.commandService.executeCommand(AI_INLINE_COMPLETION_VISIBLE.id, false);
       }),
     );
 
@@ -95,13 +101,32 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
   mountEditor(editor: IEditor) {
     const toDispose = new Disposable();
     this.aiInlineCompletionsProvider.mountEditor(editor);
-    toDispose.addDispose(this.aiInlineCompletionsProvider);
+
     toDispose.addDispose(super.mountEditor(editor));
+    toDispose.addDispose(this.aiInlineCompletionsProvider);
+
+    const inlineVisibleKey = new Set([InlineCompletionContextKeys.inlineSuggestionVisible.key]);
+    toDispose.addDispose(
+      editor.monacoEditor.contextKeyService.onDidChangeContext((e) => {
+        // inline completion 真正消失时
+        if (e.affectsSome(inlineVisibleKey)) {
+          const inlineSuggestionVisible = InlineCompletionContextKeys.inlineSuggestionVisible.getValue(
+            editor.monacoEditor.contextKeyService,
+          );
+          if (!inlineSuggestionVisible && this.preDidShowItems) {
+            runWhenIdle(() => {
+              this.preDidShowItems = undefined;
+              this.commandService.executeCommand(AI_INLINE_COMPLETION_VISIBLE.id, false);
+            });
+          }
+        }
+      }),
+    );
     return toDispose;
   }
 
   doContribute(): IDisposable {
-    const sequencer = new Sequencer();
+    let prePosition: Position | undefined;
 
     return monacoApi.languages.registerInlineCompletionsProvider('*', {
       groupId: 'ai-native-inline-completions',
@@ -111,15 +136,34 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
           return;
         }
 
-        const list = await sequencer.queue(() =>
+        let resultList: InlineCompletions;
+
+        /**
+         * 如果新字符在 inline completion 的 ghost text 内，则走缓存，不重新请求
+         */
+        if (this.preDidShowItems) {
+          if (!prePosition) {
+            prePosition = position.delta(0, -1);
+          }
+
+          const lineBefore = model.getValueInRange(Range.fromPositions(prePosition, position));
+          if (this.preDidShowItems.items[0].insertText.toString().startsWith(lineBefore)) {
+            return this.preDidShowItems;
+          } else {
+            prePosition = undefined;
+          }
+        }
+
+        resultList = await this.sequencer.queue(() =>
           this.aiInlineCompletionsProvider.provideInlineCompletionItems(model, position, context, token),
         );
 
-        return list;
+        return resultList;
       },
       freeInlineCompletions() {},
       handleItemDidShow: (completions) => {
         if (completions.items.length > 0) {
+          this.preDidShowItems = completions;
           this.aiCompletionsService.setVisibleCompletion(true);
         }
       },

packages/ai-native/src/browser/contrib/inline-completions/model/competionModel.ts

@@ -78,4 +78,5 @@ export interface CompletionResultModelCache {
  */
 export interface InlineCompletionItem extends monaco.languages.InlineCompletion {
   sessionId: string;
+  relationId: string;
 }

packages/ai-native/src/browser/contrib/inline-completions/promptCache.ts

@@ -14,7 +14,7 @@ export class PromptCache {
   @Autowired(IHashCalculateService)
   private hashCalculateService: IHashCalculateService;
 
-  private cacheMap = new StaleLRUMap<string, IAICompletionResultModel>(15, 10, 60 * 1000);
+  private cacheMap = new StaleLRUMap<string, IAICompletionResultModel & { relationId: string }>(15, 10, 60 * 1000);
 
   getCache(prompt: string) {
     if (!isCacheEnable()) {

packages/ai-native/src/browser/contrib/inline-completions/service/ai-completions.service.ts

@@ -106,10 +106,11 @@ export class AICompletionsService extends Disposable {
   }
 
   public async reporterEnd(relationId: string, data: CompletionRT) {
-    this.aiReporter.end(relationId, {
+    const reportData = {
       ...data,
       isValid: typeof data.renderingTime === 'number' ? data.renderingTime > 750 : false,
-    });
+    };
+    this.aiReporter.end(relationId, reportData);
   }
 
   public setVisibleCompletion(visible: boolean) {

packages/collaboration/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-collaboration",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "files": [
     "lib",
     "src"