@opensumi/ide-ai-native 3.7.1-next-1739774311.0 → 3.7.1

package/src/browser/contrib/intelligent-completions/source/line-change.source.ts

@@ -1,15 +1,6 @@
 import { Injectable } from '@opensumi/di';
 import { AINativeSettingSectionsId, ECodeEditsSourceTyping, IDisposable } from '@opensumi/ide-core-common';
-import { ICursorPositionChangedEvent, IModelContentChangedEvent } from '@opensumi/ide-monaco';
-import {
-  autorunDelta,
-  derived,
-  derivedHandleChanges,
-  observableFromEvent,
-  onObservableChange,
-} from '@opensumi/ide-monaco/lib/common/observable';
-
-import { IntelligentCompletionsController } from '../intelligent-completions.controller';
+import { ICursorPositionChangedEvent, Position } from '@opensumi/ide-monaco';
 
 import { BaseCodeEditsSource } from './base';
 
@@ -18,137 +9,39 @@ export interface ILineChangeData {
   preLineNumber?: number;
 }
 
-const DEPRECATED_LIMIT = 5;
-const CONTENT_CHANGE_VALID_TIME = 60 * 1000;
-
 @Injectable({ multiple: true })
 export class LineChangeCodeEditsSource extends BaseCodeEditsSource {
-  public priority = 1;
-
-  /**
-   * 在当前文件，计算弃用上次 edit 时的次数是否超过了阈值 {@link DEPRECATED_LIMIT} 次，超过则不会触发
-   * 1. 直接 esc 弃用
-   * 2. 用户再次移动光标位置致使补全消失也视为弃用
-   */
-  private readonly deprecatedStore = new Map<string, number>();
-
-  private readonly positionChangeObs = observableFromEvent<ICursorPositionChangedEvent>(
-    this,
-    this.monacoEditor.onDidChangeCursorPosition,
-    (event: ICursorPositionChangedEvent) => event,
-  );
-
-  private readonly contentChangeObs = observableFromEvent<IModelContentChangedEvent>(
-    this,
-    this.monacoEditor.onDidChangeModelContent,
-    (event: IModelContentChangedEvent) => event,
-  );
-
-  private readonly latestContentChangeTimeObs = derivedHandleChanges(
-    {
-      owner: this,
-      createEmptyChangeSummary: () => ({ latestContentChangeTime: 0 }),
-      handleChange: (context, changeSummary) => {
-        if (context.didChange(this.contentChangeObs)) {
-          changeSummary.latestContentChangeTime = Date.now();
-        }
-        return true;
-      },
-    },
-    (reader, changeSummary) => {
-      this.contentChangeObs.read(reader);
-      return changeSummary.latestContentChangeTime;
-    },
-  );
-
-  private readonly isAllowTriggerObs = derived((reader) => {
-    this.positionChangeObs.read(reader);
-    const latestContentChangeTime = this.latestContentChangeTimeObs.read(reader);
-
-    const isLineChangeEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLineChange, false);
+  public priority = 2;
 
-    /**
-     * 配置开关
-     */
-    if (!isLineChangeEnabled) {
-      return false;
-    }
-
-    /**
-     * 弃用次数规则的限制
-     */
-    const deprecatedCount = this.deprecatedStore.get(this.model?.id || '');
-    if (deprecatedCount && deprecatedCount >= DEPRECATED_LIMIT) {
-      return false;
-    }
-
-    /**
-     * 1. 未编辑过代码不触发
-     * 2. 编辑过代码后，60 内没有再次编辑也不触发
-     */
-    if (
-      latestContentChangeTime === 0 ||
-      (latestContentChangeTime && Date.now() - latestContentChangeTime > CONTENT_CHANGE_VALID_TIME)
-    ) {
-      return false;
-    }
-
-    return true;
-  });
+  private prePosition = this.monacoEditor.getPosition();
 
   public mount(): IDisposable {
     this.addDispose(
-      autorunDelta(this.positionChangeObs, ({ lastValue, newValue }, reader) => {
-        const isAllowTriggerObs = this.isAllowTriggerObs.read(reader);
-        if (!isAllowTriggerObs) {
-          return false;
-        }
-
-        const prePosition = lastValue?.position;
-        const currentPosition = newValue?.position;
-        if (prePosition && prePosition.lineNumber !== currentPosition?.lineNumber) {
-          this.setBean({
-            typing: ECodeEditsSourceTyping.LineChange,
-            data: {
-              [ECodeEditsSourceTyping.LineChange]: {
-                preLineNumber: prePosition.lineNumber,
-                currentLineNumber: currentPosition.lineNumber,
-              },
-            },
-          });
+      this.monacoEditor.onDidChangeCursorPosition((event: ICursorPositionChangedEvent) => {
+        const currentPosition = event.position;
+        if (this.prePosition && this.prePosition.lineNumber !== currentPosition.lineNumber) {
+          this.doTrigger(currentPosition);
+          this.prePosition = currentPosition;
         }
       }),
     );
+    return this;
+  }
 
-    const discard = IntelligentCompletionsController.get(this.monacoEditor)?.discard;
-    const accept = IntelligentCompletionsController.get(this.monacoEditor)?.accept;
-    if (discard) {
-      this.addDispose(
-        onObservableChange(discard, (isValid: boolean) => {
-          const modelId = this.model?.id;
-          if (!modelId || !isValid) {
-            return;
-          }
-
-          const count = this.deprecatedStore.get(modelId) || 0;
-          this.deprecatedStore.set(modelId, count + 1);
-        }),
-      );
-    }
-
-    if (accept) {
-      this.addDispose(
-        onObservableChange(accept, () => {
-          const modelId = this.model?.id;
-          if (!modelId) {
-            return;
-          }
+  protected doTrigger(position: Position) {
+    const isLineChangeEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLineChange, false);
 
-          this.deprecatedStore.delete(modelId);
-        }),
-      );
+    if (!isLineChangeEnabled || !position) {
+      return;
     }
 
-    return this;
+    this.setBean({
+      typing: ECodeEditsSourceTyping.LineChange,
+      position,
+      data: {
+        preLineNumber: this.prePosition?.lineNumber,
+        currentLineNumber: position.lineNumber,
+      },
+    });
   }
 }

package/src/browser/contrib/intelligent-completions/source/lint-error.source.ts

@@ -1,8 +1,14 @@
-import { Injectable } from '@opensumi/di';
-import { AINativeSettingSectionsId, ECodeEditsSourceTyping, IDisposable } from '@opensumi/ide-core-common';
+import { Autowired, Injectable } from '@opensumi/di';
+import {
+  AINativeSettingSectionsId,
+  ECodeEditsSourceTyping,
+  Event,
+  FRAME_THREE,
+  IDisposable,
+} from '@opensumi/ide-core-common';
 import { ICursorPositionChangedEvent, IPosition, Position } from '@opensumi/ide-monaco';
 import { URI } from '@opensumi/ide-monaco/lib/browser/monaco-api';
-import { autorunDelta, observableFromEvent } from '@opensumi/ide-monaco/lib/common/observable';
+import { IWorkspaceService } from '@opensumi/ide-workspace';
 import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 import {
   IMarker,
@@ -14,6 +20,7 @@ import {
 import { BaseCodeEditsSource } from './base';
 
 export interface ILinterErrorData {
+  relativeWorkspacePath: string;
   errors: Array<IMarkerErrorData>;
 }
 
@@ -51,19 +58,22 @@ namespace MarkerErrorData {
 
 @Injectable({ multiple: true })
 export class LintErrorCodeEditsSource extends BaseCodeEditsSource {
-  public priority = 0;
+  public priority = 1;
+
+  @Autowired(IWorkspaceService)
+  private readonly workspaceService: IWorkspaceService;
 
   public mount(): IDisposable {
-    const positionChangeObs = observableFromEvent<ICursorPositionChangedEvent>(
-      this,
-      this.monacoEditor.onDidChangeCursorPosition,
-      (event: ICursorPositionChangedEvent) => event,
-    );
+    let prePosition = this.monacoEditor.getPosition();
 
     this.addDispose(
-      autorunDelta(positionChangeObs, ({ lastValue, newValue }) => {
-        const prePosition = lastValue?.position;
-        const currentPosition = newValue?.position;
+      // 仅在光标的行号发生变化时，才触发
+      Event.debounce(
+        this.monacoEditor.onDidChangeCursorPosition,
+        (_, e) => e,
+        FRAME_THREE,
+      )(async (event: ICursorPositionChangedEvent) => {
+        const currentPosition = event.position;
 
         // 如果是 selection 则不触发
         const selection = this.monacoEditor.getSelection();
@@ -71,16 +81,16 @@ export class LintErrorCodeEditsSource extends BaseCodeEditsSource {
           return;
         }
 
-        // 仅在光标的行号发生变化时，才触发
-        if (prePosition && prePosition.lineNumber !== currentPosition?.lineNumber) {
-          this.doTrigger(currentPosition);
+        if (prePosition && prePosition.lineNumber !== currentPosition.lineNumber) {
+          await this.doTrigger(currentPosition);
         }
+        prePosition = currentPosition;
       }),
     );
     return this;
   }
 
-  protected doTrigger(position: Position) {
+  protected async doTrigger(position: Position) {
     const isLintErrorsEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLintErrors, false);
 
     if (!isLintErrorsEnabled || !this.model) {
@@ -94,12 +104,14 @@ export class LintErrorCodeEditsSource extends BaseCodeEditsSource {
     markers = markers.filter((marker) => Math.abs(marker.startLineNumber - position.lineNumber) <= 1);
 
     if (markers.length) {
+      const relativeWorkspacePath = await this.workspaceService.asRelativePath(resource.path);
+
       this.setBean({
         typing: ECodeEditsSourceTyping.LinterErrors,
+        position,
         data: {
-          [ECodeEditsSourceTyping.LinterErrors]: {
-            errors: markers.map((marker) => MarkerErrorData.toData(marker)),
-          },
+          relativeWorkspacePath: relativeWorkspacePath?.path ?? resource.path,
+          errors: markers.map((marker) => MarkerErrorData.toData(marker)),
         },
       });
     }

package/src/browser/contrib/terminal/component/terminal-command-suggest-controller.tsx

@@ -1,4 +1,4 @@
-import debounce from 'lodash/debounce';
+import { debounce } from 'lodash';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 
 import { Emitter, localize } from '@opensumi/ide-core-browser';

package/src/browser/index.ts

@@ -46,7 +46,7 @@ import { LanguageParserService } from './languages/service';
 import { AINativePreferencesContribution } from './preferences';
 import { AINativeCoreContribution } from './types';
 import { InlineChatFeatureRegistry } from './widget/inline-chat/inline-chat.feature.registry';
-import { InlineChatService } from './widget/inline-chat/inline-chat.service';
+import { AIInlineChatService } from './widget/inline-chat/inline-chat.service';
 import { InlineDiffService } from './widget/inline-diff';
 
 @Injectable()
@@ -90,7 +90,7 @@ export class AINativeModule extends BrowserModule {
     },
     {
       token: IAIInlineChatService,
-      useClass: InlineChatService,
+      useClass: AIInlineChatService,
     },
     {
       token: IChatManagerService,

package/src/browser/languages/tree-sitter/wasm-manager.ts

@@ -29,12 +29,7 @@ export class WasmModuleManager {
 
   async initParser() {
     const baseUrl = await this.resolvedResourceUriDeferred.promise;
-    let wasmPath;
-    if (baseUrl.endsWith('/')) {
-      wasmPath = `${baseUrl}tree-sitter.wasm`;
-    } else {
-      wasmPath = `${baseUrl}/tree-sitter.wasm`;
-    }
+    const wasmPath = `${baseUrl}/tree-sitter.wasm`;
     if (!this.parserInitialized) {
       await Parser.init({
         locateFile: () => wasmPath,
@@ -50,12 +45,7 @@ export class WasmModuleManager {
       const deferred = new Deferred<ArrayBuffer>();
       this.cachedRuntime.set(language, deferred);
       const baseUrl = await this.resolvedResourceUriDeferred.promise;
-      let wasmUrl;
-      if (baseUrl.endsWith('/')) {
-        wasmUrl = `${baseUrl}tree-sitter-${language}.wasm`;
-      } else {
-        wasmUrl = `${baseUrl}/tree-sitter-${language}.wasm`;
-      }
+      const wasmUrl = `${baseUrl}/tree-sitter-${language}.wasm`;
       fetch(wasmUrl)
         .then((res) => res.arrayBuffer())
         .then((buffer) => {

package/src/browser/layout/ai-layout.tsx

@@ -10,14 +10,11 @@ export const AILayout = () => {
   const { layout } = getStorageValue();
   const designLayoutConfig = useInjectable(DesignLayoutConfig);
 
-  const defaultRightSize = useMemo(
-    () => (designLayoutConfig.useMergeRightWithLeftPanel ? 0 : 49),
-    [designLayoutConfig.useMergeRightWithLeftPanel],
-  );
+  const defaultRightSize = useMemo(() => designLayoutConfig.useMergeRightWithLeftPanel ? 0 : 49, [designLayoutConfig.useMergeRightWithLeftPanel]);
 
   return (
     <BoxPanel direction='top-to-bottom'>
-      <SlotRenderer id='top' defaultSize={layout.top?.currentId ? layout.top?.size || 32 : 32} slot='top' />
+      <SlotRenderer id='top' defaultSize={layout.top?.currentId ? layout.top?.size || 35 : 0} slot='top' />
       <SplitPanel
         id='main-horizontal-ai'
         flex={1}

package/src/browser/layout/layout.module.less

@@ -119,20 +119,20 @@
   border: none;
 }
 
-.header {
-  height: 36px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 10px;
-  background-color: var(--editorGroupHeader-tabsBackground);
-}
-
 .right_slot_container_wrap {
   height: 100%;
   display: flex;
   flex-direction: column;
 
+  .header {
+    height: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 10px;
+    background-color: var(--editorGroupHeader-tabsBackground);
+  }
+
   .container {
     flex: 1;
   }

package/src/browser/layout/tabbar.view.tsx

@@ -174,18 +174,16 @@ export const AIRightTabRenderer = ({
     return (
       <ContainerView
         {...props}
-        customTitleBar={
-          <div className={styles.header}>
-            <span className={styles.title}>{options && options.title}</span>
-            <div className={styles.side}>
-              <EnhancePopover id={'ai_right_panel_header_close'} title={localize('editor.title.context.close')}>
-                <EnhanceIcon icon='close' onClick={handleClose} />
-              </EnhancePopover>
-            </div>
-          </div>
-        }
         renderContainerWrap={({ children }) => (
           <div className={styles.right_slot_container_wrap}>
+            <div className={styles.header}>
+              <span className={styles.title}>{options && options.title}</span>
+              <div className={styles.side}>
+                <EnhancePopover id={'ai_right_panel_header_close'} title={localize('editor.title.context.close')}>
+                  <EnhanceIcon icon='close' onClick={handleClose} />
+                </EnhancePopover>
+              </div>
+            </div>
             <div className={styles.container}>{children}</div>
           </div>
         )}

package/src/browser/model/enhanceDecorationsCollection.ts

@@ -1,15 +1,20 @@
-import { Disposable, Emitter, Event, isDefined, isUndefined, uuid } from '@opensumi/ide-core-common';
+import { Disposable, Emitter, Event, isDefined, isUndefined } from '@opensumi/ide-core-common';
 import {
   ICodeEditor,
   IContentSizeChangedEvent,
   IModelDecorationOptions,
+  IModelDecorationsChangeAccessor,
   IModelDeltaDecoration,
   IPosition,
   IRange,
   ITextModel,
+  Range,
 } from '@opensumi/ide-monaco';
+import { space } from '@opensumi/ide-utils/lib/strings';
 import { UndoRedoGroup } from '@opensumi/monaco-editor-core/esm/vs/platform/undoRedo/common/undoRedo';
 
+import styles from './styles.module.less';
+
 export interface IDecorationSerializableState {
   startPosition: IPosition;
   endPosition: IPosition;
@@ -23,10 +28,8 @@ interface IDeltaData extends IModelDeltaDecoration {
 
 export interface IEnhanceModelDeltaDecoration extends IDeltaData {
   id: string;
-  decorationId: string;
   isHidden: boolean;
   readonly editorDecoration: IModelDeltaDecoration;
-  show(): void;
   hide(): void;
   resume(): void;
   getRange(): IRange;
@@ -44,13 +47,12 @@ export interface IDeltaDecorationsOptions {
   group?: UndoRedoGroup;
 }
 
-export class DeltaDecorations implements IEnhanceModelDeltaDecoration {
+class DeltaDecorations implements IEnhanceModelDeltaDecoration {
   length: number;
   range: IRange;
   options: IModelDecorationOptions;
 
   private resumeRange: IRange;
-  private _decorationId: string;
   private _group: UndoRedoGroup;
 
   private _hidden = false;
@@ -70,10 +72,6 @@ export class DeltaDecorations implements IEnhanceModelDeltaDecoration {
     return this.metadata.id;
   }
 
-  get decorationId(): string {
-    return this._decorationId;
-  }
-
   get editorDecoration(): IModelDeltaDecoration {
     return this.metadata.editorDecoration;
   }
@@ -110,6 +108,25 @@ export class DeltaDecorations implements IEnhanceModelDeltaDecoration {
     this._group = group;
   }
 
+  private changeVisibility(newClassName: string, newRange: Range): void {
+    if (!this.options.className) {
+      return;
+    }
+
+    const classList = this.options.className
+      .split(space)
+      .filter((s) => s !== styles.hidden && s !== styles.visible)
+      .filter(Boolean);
+    classList.push(newClassName);
+
+    this.options.className = classList.join(space);
+
+    this.codeEditor.changeDecorations((accessor) => {
+      accessor.changeDecorationOptions(this.id, this.options);
+      accessor.changeDecoration(this.id, newRange);
+    });
+  }
+
   setRange(newRange: IRange): void {
     this.range = newRange;
   }
@@ -119,45 +136,28 @@ export class DeltaDecorations implements IEnhanceModelDeltaDecoration {
   }
 
   dispose(): void {
-    this.hide();
     this.deltaData.dispose?.();
   }
 
-  show(): void {
-    this.codeEditor.changeDecorations((accessor) => {
-      this._decorationId = accessor.addDecoration(this.range, this.options);
-    });
-  }
-
   hide(): void {
     this.resumeRange = this.range;
     this._hidden = true;
-    if (this._decorationId) {
-      this.codeEditor.changeDecorations((accessor) => {
-        accessor.removeDecoration(this._decorationId);
-      });
-    }
+    const startPosition = { lineNumber: this.range.startLineNumber, column: 1 };
+    const newRange = Range.fromPositions(startPosition);
+    this.changeVisibility(styles.hidden, newRange);
   }
 
   resume(): void {
-    if (!this._hidden) {
-      return;
-    }
-
     this._hidden = false;
-    this.codeEditor.changeDecorations((accessor) => {
-      this._decorationId = accessor.addDecoration(this.resumeRange, this.options);
-    });
+    this.changeVisibility(styles.visible, Range.lift(this.resumeRange));
   }
 }
 
-export class EnhanceDecorationsCollection<
-  T extends IEnhanceModelDeltaDecoration = IEnhanceModelDeltaDecoration,
-> extends Disposable {
-  private deltaDecorations: T[] = [];
+export class EnhanceDecorationsCollection extends Disposable {
+  private deltaDecorations: IEnhanceModelDeltaDecoration[] = [];
 
-  protected readonly _onDidDecorationsChange = this.registerDispose(new Emitter<T[]>());
-  public readonly onDidDecorationsChange: Event<T[]> = this._onDidDecorationsChange.event;
+  protected readonly _onDidDecorationsChange = this.registerDispose(new Emitter<IEnhanceModelDeltaDecoration[]>());
+  public readonly onDidDecorationsChange: Event<IEnhanceModelDeltaDecoration[]> = this._onDidDecorationsChange.event;
 
   private get model(): ITextModel {
     return this.codeEditor.getModel()!;
@@ -182,11 +182,11 @@ export class EnhanceDecorationsCollection<
   private flush(): void {
     this.deltaDecorations = this.deltaDecorations.map((d) => {
       const {
-        decorationId,
+        id,
         editorDecoration: { range },
       } = d;
 
-      const newRange = this.model.getDecorationRange(decorationId);
+      const newRange = this.model.getDecorationRange(id);
       d.setRange(newRange ?? range);
 
       return d;
@@ -196,51 +196,66 @@ export class EnhanceDecorationsCollection<
   }
 
   private delete(id: string): void {
-    this.deltaDecorations = this.deltaDecorations.filter((d) => d.id !== id);
+    this.codeEditor.changeDecorations((accessor) => {
+      accessor.removeDecoration(id);
+
+      this.deltaDecorations = this.deltaDecorations.filter((d) => d.id !== id);
+    });
   }
 
   protected createDecorations(metaData: IDeltaDecorationsOptions) {
-    return new DeltaDecorations(metaData) as unknown as T;
+    return new DeltaDecorations(metaData);
   }
 
-  set(decorations: (IModelDeltaDecoration & Partial<Pick<T, 'length' | 'isHidden' | 'group'>>)[]): void {
+  set(
+    decorations: (IModelDeltaDecoration &
+      Partial<Pick<IEnhanceModelDeltaDecoration, 'length' | 'isHidden' | 'group'>>)[],
+  ): void {
     this.clear();
 
-    this.deltaDecorations = decorations.map((decoration) => {
-      const id = uuid(6);
-
-      const dec = this.createDecorations({
-        id,
-        editorDecoration: decoration,
-        codeEditor: this.codeEditor,
-        isHidden: decoration.isHidden,
-        group: decoration.group,
-        deltaData: {
-          dispose: () => this.delete(id),
-          length: decoration.length,
-        },
-      });
-
-      dec.show();
-
-      return dec;
+    this.codeEditor.changeDecorations((accessor: IModelDecorationsChangeAccessor) => {
+      const newDecorations: IEnhanceModelDeltaDecoration[] = [];
+
+      for (const decoration of decorations) {
+        const id = accessor.addDecoration(decoration.range, decoration.options);
+        newDecorations.push(
+          this.createDecorations({
+            id,
+            editorDecoration: decoration,
+            codeEditor: this.codeEditor,
+            isHidden: decoration.isHidden,
+            group: decoration.group,
+            deltaData: {
+              dispose: () => this.delete(id),
+              length: decoration.length,
+            },
+          }),
+        );
+      }
+
+      this.deltaDecorations = newDecorations;
     });
   }
 
-  getDecorations(): T[] {
+  getDecorations(): IEnhanceModelDeltaDecoration[] {
     return this.deltaDecorations;
   }
 
-  getDecorationByGroup(group: UndoRedoGroup): T | undefined {
+  getDecorationByGroup(group: UndoRedoGroup): IEnhanceModelDeltaDecoration | undefined {
     return this.deltaDecorations.find((d) => d.group === group);
   }
 
-  getDecorationByLineNumber(lineNumber: number): T | undefined {
+  getDecorationByLineNumber(lineNumber: number): IEnhanceModelDeltaDecoration | undefined {
     return this.deltaDecorations.find((d) => d.getRange().startLineNumber === lineNumber);
   }
 
   clear(): void {
-    this.deltaDecorations.map((d) => d.dispose());
-    this.deltaDecorations = [];
+    this.codeEditor.changeDecorations((accessor) => {
+      for (const decoration of this.deltaDecorations) {
+        accessor.removeDecoration(decoration.id);
+      }
+
+      this.deltaDecorations = [];
+    });
   }
 }

package/src/browser/model/styles.module.less

@@ -0,0 +1,7 @@
+.hidden {
+  visibility: hidden;
+}
+
+.visible {
+  visibility: visible;
+}

package/src/browser/preferences/schema.ts

@@ -58,9 +58,5 @@ export const aiNativePreferenceSchema: PreferenceSchema = {
       type: 'boolean',
       default: false,
     },
-    [AINativeSettingSectionsId.CodeEditsTyping]: {
-      type: 'boolean',
-      default: false,
-    },
   },
 };