feat: support code edits perferences (#4155)

opensumi · Nov 7, 2024 · d7142f9 · d7142f9
1 parent 926108b
commit d7142f9
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 4 deletions.
diff --git a/packages/ai-native/src/browser/ai-core.contribution.ts b/packages/ai-native/src/browser/ai-core.contribution.ts
@@ -354,6 +354,19 @@ export class AINativeBrowserContribution
           },
         ],
       });
+      registry.registerSettingSection(AI_NATIVE_SETTING_GROUP_ID, {
+        title: localize('preference.ai.native.codeEdits.title'),
+        preferences: [
+          {
+            id: AINativeSettingSectionsId.CodeEditsLintErrors,
+            localized: 'preference.ai.native.codeEdits.lintErrors',
+          },
+          {
+            id: AINativeSettingSectionsId.CodeEditsLineChange,
+            localized: 'preference.ai.native.codeEdits.lineChange',
+          },
+        ],
+      });
     }
 
     if (this.aiNativeConfigService.capabilities.supportsInlineChat) {

diff --git a/packages/ai-native/src/browser/contrib/intelligent-completions/source/base.ts b/packages/ai-native/src/browser/contrib/intelligent-completions/source/base.ts
@@ -1,4 +1,5 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector, Optional } from '@opensumi/di';
+import { PreferenceService } from '@opensumi/ide-core-browser';
 import {
   AIServiceType,
   CodeEditsRT,
@@ -63,6 +64,9 @@ export abstract class BaseCodeEditsSource extends Disposable {
   @Autowired(IAIReporter)
   private aiReporter: IAIReporter;
 
+  @Autowired(PreferenceService)
+  protected preferenceService: PreferenceService;
+
   private cancellationTokenSource = new CancellationTokenSource();
   private readonly relationID = observableValue<string | undefined>(this, undefined);
 

diff --git a/packages/ai-native/src/browser/contrib/intelligent-completions/source/line-change.source.ts b/packages/ai-native/src/browser/contrib/intelligent-completions/source/line-change.source.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@opensumi/di';
-import { ECodeEditsSourceTyping, IDisposable } from '@opensumi/ide-core-common';
+import { AINativeSettingSectionsId, ECodeEditsSourceTyping, IDisposable } from '@opensumi/ide-core-common';
 import { ICursorPositionChangedEvent, Position } from '@opensumi/ide-monaco';
 
 import { BaseCodeEditsSource } from './base';
@@ -30,7 +30,9 @@ export class LineChangeCodeEditsSource extends BaseCodeEditsSource {
 
   private lastEditTime: number | null = null;
   protected doTrigger(position: Position) {
-    if (!position) {
+    const isLineChangeEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLineChange, false);
+
+    if (!isLineChangeEnabled || !position) {
       return;
     }
 

diff --git a/packages/ai-native/src/browser/contrib/intelligent-completions/source/lint-error.source.ts b/packages/ai-native/src/browser/contrib/intelligent-completions/source/lint-error.source.ts
@@ -1,5 +1,11 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import { ECodeEditsSourceTyping, Event, FRAME_THREE, IDisposable } from '@opensumi/ide-core-common';
+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 { IWorkspaceService } from '@opensumi/ide-workspace';
@@ -85,7 +91,9 @@ export class LintErrorCodeEditsSource extends BaseCodeEditsSource {
   }
 
   protected async doTrigger(position: Position) {
-    if (!this.model) {
+    const isLintErrorsEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLintErrors, false);
+
+    if (!isLintErrorsEnabled || !this.model) {
       return;
     }
 

diff --git a/packages/ai-native/src/browser/preferences/schema.ts b/packages/ai-native/src/browser/preferences/schema.ts
@@ -50,5 +50,13 @@ export const aiNativePreferenceSchema: PreferenceSchema = {
       type: 'boolean',
       default: false,
     },
+    [AINativeSettingSectionsId.CodeEditsLintErrors]: {
+      type: 'boolean',
+      default: false,
+    },
+    [AINativeSettingSectionsId.CodeEditsLineChange]: {
+      type: 'boolean',
+      default: false,
+    },
   },
 };
diff --git a/packages/core-common/src/settings/ai-native.ts b/packages/core-common/src/settings/ai-native.ts
@@ -16,6 +16,12 @@ export enum AINativeSettingSectionsId {
   IntelligentCompletionsDebounceTime = 'ai.native.intelligentCompletions.debounceTime',
   IntelligentCompletionsCacheEnabled = 'ai.native.intelligentCompletions.cache.enabled',
   IntelligentCompletionsAlwaysVisible = 'ai.native.intelligentCompletions.alwaysVisible',
+
+  /**
+   * Code edits settings
+   */
+  CodeEditsLintErrors = 'ai.native.codeEdits.lintErrors',
+  CodeEditsLineChange = 'ai.native.codeEdits.lineChange',
 }
 export const AI_NATIVE_SETTING_GROUP_ID = 'AI-Native';
 export const AI_NATIVE_SETTING_GROUP_TITLE = 'AI Native';
diff --git a/packages/i18n/src/common/en-US.lang.ts b/packages/i18n/src/common/en-US.lang.ts
@@ -1495,6 +1495,10 @@ export const localizationBundle = {
     'preference.ai.native.intelligentCompletions.debounceTime': 'Debounce time for intelligent completions',
     'preference.ai.native.intelligentCompletions.cache.enabled': 'Whether to enable cache for intelligent completions',
     'preference.ai.native.intelligentCompletions.alwaysVisible': 'Whether to always show intelligent completions',
+
+    'preference.ai.native.codeEdits.title': 'Code Edits',
+    'preference.ai.native.codeEdits.lintErrors': 'Whether to enable intelligent rewriting of Lint Errors',
+    'preference.ai.native.codeEdits.lineChange': 'Whether to enable intelligent rewriting of Line Change',
     // #endregion AI Native
 
     // #endregion merge editor

diff --git a/packages/i18n/src/common/zh-CN.lang.ts b/packages/i18n/src/common/zh-CN.lang.ts
@@ -1260,6 +1260,10 @@ export const localizationBundle = {
     'preference.ai.native.intelligentCompletions.debounceTime': '智能补全的延迟时间（毫秒）',
     'preference.ai.native.intelligentCompletions.cache.enabled': '是否启用智能补全的缓存',
     'preference.ai.native.intelligentCompletions.alwaysVisible': '是否总是展示智能补全',
+
+    'preference.ai.native.codeEdits.title': '智能改写',
+    'preference.ai.native.codeEdits.lintErrors': '是否开启对 Lint Error 类型的智能改写',
+    'preference.ai.native.codeEdits.lineChange': '是否开启对 Line Change 类型的智能改写',
     // #endregion AI Native
 
     'webview.webviewTagUnavailable': '非 Electron 环境不支持 webview 标签，请使用 iframe 标签',