Merge branch 'codefuse-ai:main' into electron-to-web

Author: eedpublic

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.7.0](https://code.alipay.com/cloud-ide/codefuse-ide/compare/v0.6.4...v0.7.0) (2024-11-11)
+
+
+### Features
+
+* 实现 Code Edits ([#56](https://code.alipay.com/cloud-ide/codefuse-ide/issues/56)) ([cca5fdb](https://code.alipay.com/cloud-ide/codefuse-ide/commit/cca5fdb7fc2432eae3343bb892f019e87b3701b9))
+
+
+### Bug Fixes
+
+* **deps:** update opensumi packages to v3.4.5 ([#47](https://code.alipay.com/cloud-ide/codefuse-ide/issues/47)) ([0b8282f](https://code.alipay.com/cloud-ide/codefuse-ide/commit/0b8282f9ae976c6e772cada05f67b48e2c165c4e))
+* **deps:** update opensumi packages to v3.5.0 ([#49](https://code.alipay.com/cloud-ide/codefuse-ide/issues/49)) ([a5d9c5b](https://code.alipay.com/cloud-ide/codefuse-ide/commit/a5d9c5b244491c18bf057ea6788a181822cb102d))
+
 ### [0.6.4](https://code.alipay.com/cloud-ide/codefuse-ide/compare/v0.6.3...v0.6.4) (2024-10-16)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codefuse-ide",
-  "version": "0.6.4",
+  "version": "0.7.0",
   "description": "CodeFuse AI Native IDE",
   "main": "out/main",
   "scripts": {
@@ -44,7 +44,7 @@
     "conventional-changelog-cli": "^5.0.0",
     "copy-webpack-plugin": "^12.0.2",
     "cross-env": "^7.0.3",
-    "css-loader": "7",
+    "css-loader": "^6",
     "debug": "^4.3.7",
     "electron": "30.1.2",
     "extract-zip": "^2.0.1",

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

@@ -8,11 +8,12 @@ import {
   IAIBackService,
   CancellationToken,
   ChatResponse,
+  ECodeEditsSourceTyping,
 } from '@opensumi/ide-core-common';
 import { ClientAppContribution, Domain, getIcon } from '@opensumi/ide-core-browser';
 import { ComponentContribution, ComponentRegistry } from '@opensumi/ide-core-browser/lib/layout';
-import { AINativeCoreContribution, ERunStrategy, IChatFeatureRegistry, IInlineChatFeatureRegistry, IProblemFixContext, IProblemFixProviderRegistry, IRenameCandidatesProviderRegistry, ITerminalProviderRegistry, TChatSlashCommandSend, TerminalSuggestionReadableStream } from '@opensumi/ide-ai-native/lib/browser/types';
-import { ICodeEditor, MarkdownString, NewSymbolNameTag } from '@opensumi/ide-monaco';
+import { AINativeCoreContribution, ERunStrategy, IChatFeatureRegistry, IInlineChatFeatureRegistry, IIntelligentCompletionsRegistry, IProblemFixContext, IProblemFixProviderRegistry, IRenameCandidatesProviderRegistry, ITerminalProviderRegistry, TChatSlashCommandSend, TerminalSuggestionReadableStream } from '@opensumi/ide-ai-native/lib/browser/types';
+import { ICodeEditor, MarkdownString, NewSymbolNameTag, Range } from '@opensumi/ide-monaco';
 import { MessageService } from '@opensumi/ide-overlay/lib/browser/message.service';
 import { BaseTerminalDetectionLineMatcher, JavaMatcher, MatcherType, NodeMatcher, NPMMatcher, ShellMatcher, TSCMatcher } from '@opensumi/ide-ai-native/lib/browser/contrib/terminal/matcher';
 import { ChatService } from '@opensumi/ide-ai-native/lib/browser/chat/chat.api.service';
@@ -22,12 +23,13 @@ import { listenReadable } from '@opensumi/ide-utils/lib/stream';
 
 import { AI_MENU_BAR_LEFT_ACTION, EInlineOperation } from './constants'
 import { LeftToolbar } from './components/left-toolbar'
-import { explainPrompt, testPrompt, optimizePrompt, detectIntentPrompt, RenamePromptManager, terminalCommandSuggestionPrompt } from './prompt'
+import { explainPrompt, testPrompt, optimizePrompt, detectIntentPrompt, RenamePromptManager, terminalCommandSuggestionPrompt, codeEditsLintErrorPrompt } from './prompt'
 import { CommandRender } from './command/command-render'
 import { AITerminalDebugService } from './ai-terminal-debug.service'
 import { InlineChatOperationModel } from './inline-chat-operation'
 import { AICommandService } from './command/command.service'
 import hiPng from './assets/hi.png'
+import { ILinterErrorData } from '@opensumi/ide-ai-native/lib/browser/contrib/intelligent-completions/source/lint-error.source';
 
 @Domain(ComponentContribution, AINativeCoreContribution)
 export class AINativeContribution implements ComponentContribution, AINativeCoreContribution {
@@ -551,4 +553,47 @@ ${editor.getModel()!.getValueInRange(editRange)}
       },
     });
   }
+
+  registerIntelligentCompletionFeature(registry: IIntelligentCompletionsRegistry): void {
+    registry.registerCodeEditsProvider(async (editor, _position, bean, token) => {
+      const model = editor.getModel();
+      if (!model) {
+        return;
+      }
+
+      if (bean.typing === ECodeEditsSourceTyping.LinterErrors) {
+        const errors = (bean.data as ILinterErrorData).errors;
+
+        if (errors.length === 0) {
+          return;
+        }
+
+        const lastItem = errors[errors.length - 1];
+        const lastRange = lastItem.range;
+
+        const waringRange = Range.fromPositions(
+          { lineNumber: errors[0].range.startPosition.lineNumber, column: 1 },
+          { lineNumber: lastRange.endPosition.lineNumber, column: model!.getLineMaxColumn(lastRange.endPosition.lineNumber) }
+        );
+
+        const prompt = codeEditsLintErrorPrompt(model.getValueInRange(waringRange), errors);
+        const response = await this.aiBackService.request(prompt, {}, token);
+
+        if (response.data) {
+          const controller = new InlineChatController({ enableCodeblockRender: true });
+          const codeData = controller['calculateCodeBlocks'](response.data);
+
+          return {
+            items: [
+              {
+                insertText: codeData,
+                range: waringRange
+              }
+            ]
+          };
+        }
+      }
+      return undefined;
+    });
+  }
 }

src/ai/browser/prompt.ts

@@ -1,3 +1,4 @@
+import { IMarkerErrorData } from '@opensumi/ide-ai-native/lib/browser/contrib/intelligent-completions/source/lint-error.source';
 import { EInlineOperation } from './constants'
 
 export const explainPrompt = (language: string, code: string) => {
@@ -87,3 +88,40 @@ ${below.slice(0, 500)}
     return lines;
   }
 }
+
+
+export const codeEditsLintErrorPrompt = (text: string, errors: IMarkerErrorData[]) => {
+  return `
+  #Role: 代码领域的 IDE 专家
+
+  #Profile:
+  - description: 熟悉各种编程语言并擅长解决由语言服务引起的各种问题，能够快速定位问题并提供解决方案，专注于代码质量和错误修复的专家
+  
+  ##Goals:
+  - 修复代码中的 error 错误，提升代码质量
+  
+  ##Constrains:
+  - 仅修改必要的代码以修复错误
+  - 保持代码的原始功能和逻辑不变
+  - 保持代码的缩进规则不变，这是强规定，你需要检查代码的缩进规则，并保持这个缩进规则
+  
+  ##Skills:
+  - 熟悉 Java/TypeScript/JavaScript/Python 等语言
+  - 能够根据错误信息快速定位问题并提供解决方案
+  
+  ##Workflows:
+  - 分析提供的代码和错误信息
+  - 提供修复步骤和修改后的代码
+
+  ##CodeSnippet：
+  - 以下是有问题的代码片段
+\`\`\`
+${text}
+\`\`\`
+  
+  ##LintErrors:
+  ${JSON.stringify(errors.map(e => ({ message: e.message })))}
+
+  请根据上述错误信息，直接提供修复后的代码，不需要解释
+`;
+};

yarn.lock

@@ -3721,7 +3721,7 @@ __metadata:
     conventional-changelog-cli: "npm:^5.0.0"
     copy-webpack-plugin: "npm:^12.0.2"
     cross-env: "npm:^7.0.3"
-    css-loader: "npm:7"
+    css-loader: "npm:^6"
     debug: "npm:^4.3.7"
     electron: "npm:30.1.2"
     electron-updater: "npm:6.3.9"
@@ -4539,9 +4539,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-loader@npm:7":
-  version: 7.1.2
-  resolution: "css-loader@npm:7.1.2"
+"css-loader@npm:^6":
+  version: 6.11.0
+  resolution: "css-loader@npm:6.11.0"
   dependencies:
     icss-utils: "npm:^5.1.0"
     postcss: "npm:^8.4.33"
@@ -4553,13 +4553,13 @@ __metadata:
     semver: "npm:^7.5.4"
   peerDependencies:
     "@rspack/core": 0.x || 1.x
-    webpack: ^5.27.0
+    webpack: ^5.0.0
   peerDependenciesMeta:
     "@rspack/core":
       optional: true
     webpack:
       optional: true
-  checksum: 10/ddde22fb103888320f60a1414a6a04638d2e9760a532a52d03c45e6e2830b32dd76c734aeef426f78dd95b2d15f77eeec3854ac53061aff02569732dc6e6801c
+  checksum: 10/9e3665509f6786d46683de5c5f5c4bdd4aa62396b4017b41dbbb41ea5ada4012c80ee1e3302b79b504bc24da7fa69e3552d99006cecc953e0d9eef4a3053b929
   languageName: node
   linkType: hard