From f41e85e2f52d4bbf800565482787614509ebf9b2 Mon Sep 17 00:00:00 2001 From: cte Date: Mon, 28 Apr 2025 22:53:02 -0700 Subject: [PATCH 1/7] Quick fix actions --- src/activate/handleTask.ts | 7 +- src/activate/registerCodeActions.ts | 48 +----- src/activate/registerCommands.ts | 37 ++++- src/core/CodeActionProvider.ts | 68 ++------- src/core/__tests__/CodeActionProvider.test.ts | 27 +--- src/core/webview/ClineProvider.ts | 12 +- webview-ui/package-lock.json | 143 ++++++++---------- webview-ui/src/components/chat/ChatView.tsx | 1 + 8 files changed, 116 insertions(+), 227 deletions(-) diff --git a/src/activate/handleTask.ts b/src/activate/handleTask.ts index 7bce8c75beb..0f99380df58 100644 --- a/src/activate/handleTask.ts +++ b/src/activate/handleTask.ts @@ -1,22 +1,23 @@ import * as vscode from "vscode" + import { COMMAND_IDS } from "../core/CodeActionProvider" import { ClineProvider } from "../core/webview/ClineProvider" import { t } from "../i18n" export const handleNewTask = async (params: { prompt?: string } | null | undefined) => { let prompt = params?.prompt + if (!prompt) { prompt = await vscode.window.showInputBox({ prompt: t("common:input.task_prompt"), placeHolder: t("common:input.task_placeholder"), }) } + if (!prompt) { await vscode.commands.executeCommand("roo-cline.SidebarProvider.focus") return } - await ClineProvider.handleCodeAction(COMMAND_IDS.NEW_TASK, "NEW_TASK", { - userInput: prompt, - }) + await ClineProvider.handleCodeAction(COMMAND_IDS.NEW_TASK, "NEW_TASK", { userInput: prompt }) } diff --git a/src/activate/registerCodeActions.ts b/src/activate/registerCodeActions.ts index 31f474442d3..d2f0eb1e83d 100644 --- a/src/activate/registerCodeActions.ts +++ b/src/activate/registerCodeActions.ts @@ -5,30 +5,7 @@ import { EditorUtils } from "../core/EditorUtils" import { ClineProvider } from "../core/webview/ClineProvider" export const registerCodeActions = (context: vscode.ExtensionContext) => { - registerCodeActionPair( - context, - COMMAND_IDS.EXPLAIN, - "EXPLAIN", - "What would you like Roo to explain?", - "E.g. How does the error handling work?", - ) - - registerCodeActionPair( - context, - COMMAND_IDS.FIX, - "FIX", - "What would you like Roo to fix?", - "E.g. Maintain backward compatibility", - ) - - registerCodeActionPair( - context, - COMMAND_IDS.IMPROVE, - "IMPROVE", - "What would you like Roo to improve?", - "E.g. Focus on performance optimization", - ) - + registerCodeAction(context, COMMAND_IDS.FIX, "FIX") registerCodeAction(context, COMMAND_IDS.ADD_TO_CONTEXT, "ADD_TO_CONTEXT") } @@ -36,20 +13,11 @@ const registerCodeAction = ( context: vscode.ExtensionContext, command: string, promptType: keyof typeof ACTION_NAMES, - inputPrompt?: string, - inputPlaceholder?: string, ) => { let userInput: string | undefined context.subscriptions.push( vscode.commands.registerCommand(command, async (...args: any[]) => { - if (inputPrompt) { - userInput = await vscode.window.showInputBox({ - prompt: inputPrompt, - placeHolder: inputPlaceholder, - }) - } - // Handle both code action and direct command cases. let filePath: string let selectedText: string @@ -79,17 +47,3 @@ const registerCodeAction = ( }), ) } - -const registerCodeActionPair = ( - context: vscode.ExtensionContext, - baseCommand: string, - promptType: keyof typeof ACTION_NAMES, - inputPrompt?: string, - inputPlaceholder?: string, -) => { - // Register new task version. - registerCodeAction(context, baseCommand, promptType, inputPrompt, inputPlaceholder) - - // Register current task version. - registerCodeAction(context, `${baseCommand}InCurrentTask`, promptType, inputPrompt, inputPlaceholder) -} diff --git a/src/activate/registerCommands.ts b/src/activate/registerCommands.ts index a2ce707dabd..ffb419ddfd1 100644 --- a/src/activate/registerCommands.ts +++ b/src/activate/registerCommands.ts @@ -66,31 +66,51 @@ const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOpt "roo-cline.activationCompleted": () => {}, "roo-cline.plusButtonClicked": async () => { const visibleProvider = getVisibleProviderOrLog(outputChannel) - if (!visibleProvider) return + + if (!visibleProvider) { + return + } + await visibleProvider.removeClineFromStack() await visibleProvider.postStateToWebview() await visibleProvider.postMessageToWebview({ type: "action", action: "chatButtonClicked" }) }, "roo-cline.mcpButtonClicked": () => { const visibleProvider = getVisibleProviderOrLog(outputChannel) - if (!visibleProvider) return + + if (!visibleProvider) { + return + } + visibleProvider.postMessageToWebview({ type: "action", action: "mcpButtonClicked" }) }, "roo-cline.promptsButtonClicked": () => { const visibleProvider = getVisibleProviderOrLog(outputChannel) - if (!visibleProvider) return + + if (!visibleProvider) { + return + } + visibleProvider.postMessageToWebview({ type: "action", action: "promptsButtonClicked" }) }, "roo-cline.popoutButtonClicked": () => openClineInNewTab({ context, outputChannel }), "roo-cline.openInNewTab": () => openClineInNewTab({ context, outputChannel }), "roo-cline.settingsButtonClicked": () => { const visibleProvider = getVisibleProviderOrLog(outputChannel) - if (!visibleProvider) return + + if (!visibleProvider) { + return + } + visibleProvider.postMessageToWebview({ type: "action", action: "settingsButtonClicked" }) }, "roo-cline.historyButtonClicked": () => { const visibleProvider = getVisibleProviderOrLog(outputChannel) - if (!visibleProvider) return + + if (!visibleProvider) { + return + } + visibleProvider.postMessageToWebview({ type: "action", action: "historyButtonClicked" }) }, "roo-cline.helpButtonClicked": () => { @@ -118,6 +138,7 @@ const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOpt "roo-cline.focusInput": async () => { try { const panel = getPanel() + if (!panel) { await vscode.commands.executeCommand("workbench.view.extension.roo-cline-ActivityBar") } else if (panel === tabPanel) { @@ -132,7 +153,11 @@ const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOpt }, "roo.acceptInput": () => { const visibleProvider = getVisibleProviderOrLog(outputChannel) - if (!visibleProvider) return + + if (!visibleProvider) { + return + } + visibleProvider.postMessageToWebview({ type: "acceptInput" }) }, } diff --git a/src/core/CodeActionProvider.ts b/src/core/CodeActionProvider.ts index f9a90e854ee..42ce6397c4f 100644 --- a/src/core/CodeActionProvider.ts +++ b/src/core/CodeActionProvider.ts @@ -1,19 +1,17 @@ import * as vscode from "vscode" + import { EditorUtils } from "./EditorUtils" -export const ACTION_NAMES = { - EXPLAIN: "Roo Code: Explain Code", - FIX: "Roo Code: Fix Code", - FIX_LOGIC: "Roo Code: Fix Logic", - IMPROVE: "Roo Code: Improve Code", - ADD_TO_CONTEXT: "Roo Code: Add to Context", - NEW_TASK: "Roo Code: New Task", +type CodeActionName = "FIX" | "ADD_TO_CONTEXT" | "NEW_TASK" + +export const ACTION_NAMES: Record = { + FIX: "Fix in Roo Code", + ADD_TO_CONTEXT: "Add to Roo Code", + NEW_TASK: "New Roo Code Task", } as const -export const COMMAND_IDS = { - EXPLAIN: "roo-cline.explainCode", +export const COMMAND_IDS: Record = { FIX: "roo-cline.fixCode", - IMPROVE: "roo-cline.improveCode", ADD_TO_CONTEXT: "roo-cline.addToContext", NEW_TASK: "roo-cline.newTask", } as const @@ -30,18 +28,6 @@ export class CodeActionProvider implements vscode.CodeActionProvider { return action } - private createActionPair( - baseTitle: string, - kind: vscode.CodeActionKind, - baseCommand: string, - args: any[], - ): vscode.CodeAction[] { - return [ - this.createAction(`${baseTitle} in New Task`, kind, baseCommand, args), - this.createAction(`${baseTitle} in Current Task`, kind, `${baseCommand}InCurrentTask`, args), - ] - } - public provideCodeActions( document: vscode.TextDocument, range: vscode.Range | vscode.Selection, @@ -49,6 +35,7 @@ export class CodeActionProvider implements vscode.CodeActionProvider { ): vscode.ProviderResult<(vscode.CodeAction | vscode.Command)[]> { try { const effectiveRange = EditorUtils.getEffectiveRange(document, range) + if (!effectiveRange) { return [] } @@ -70,57 +57,24 @@ export class CodeActionProvider implements vscode.CodeActionProvider { ), ) - actions.push( - ...this.createActionPair(ACTION_NAMES.EXPLAIN, vscode.CodeActionKind.QuickFix, COMMAND_IDS.EXPLAIN, [ - filePath, - effectiveRange.text, - effectiveRange.range.start.line + 1, - effectiveRange.range.end.line + 1, - ]), - ) - if (context.diagnostics.length > 0) { const relevantDiagnostics = context.diagnostics.filter((d) => EditorUtils.hasIntersectingRange(effectiveRange.range, d.range), ) if (relevantDiagnostics.length > 0) { - const diagnosticMessages = relevantDiagnostics.map(EditorUtils.createDiagnosticData) actions.push( - ...this.createActionPair(ACTION_NAMES.FIX, vscode.CodeActionKind.QuickFix, COMMAND_IDS.FIX, [ + this.createAction(ACTION_NAMES.FIX, vscode.CodeActionKind.QuickFix, COMMAND_IDS.FIX, [ filePath, effectiveRange.text, effectiveRange.range.start.line + 1, effectiveRange.range.end.line + 1, - diagnosticMessages, + relevantDiagnostics.map(EditorUtils.createDiagnosticData), ]), ) } - } else { - actions.push( - ...this.createActionPair(ACTION_NAMES.FIX_LOGIC, vscode.CodeActionKind.QuickFix, COMMAND_IDS.FIX, [ - filePath, - effectiveRange.text, - effectiveRange.range.start.line + 1, - effectiveRange.range.end.line + 1, - ]), - ) } - actions.push( - ...this.createActionPair( - ACTION_NAMES.IMPROVE, - vscode.CodeActionKind.RefactorRewrite, - COMMAND_IDS.IMPROVE, - [ - filePath, - effectiveRange.text, - effectiveRange.range.start.line + 1, - effectiveRange.range.end.line + 1, - ], - ), - ) - return actions } catch (error) { console.error("Error providing code actions:", error) diff --git a/src/core/__tests__/CodeActionProvider.test.ts b/src/core/__tests__/CodeActionProvider.test.ts index be462e1e068..fa8db93af41 100644 --- a/src/core/__tests__/CodeActionProvider.test.ts +++ b/src/core/__tests__/CodeActionProvider.test.ts @@ -2,9 +2,10 @@ import * as vscode from "vscode" -import { CodeActionProvider, ACTION_NAMES } from "../CodeActionProvider" import { EditorUtils } from "../EditorUtils" +import { CodeActionProvider, ACTION_NAMES } from "../CodeActionProvider" + // Mock VSCode API jest.mock("vscode", () => ({ CodeAction: jest.fn().mockImplementation((title, kind) => ({ @@ -77,34 +78,20 @@ describe("CodeActionProvider", () => { it("should provide explain, improve, fix logic, and add to context actions by default", () => { const actions = provider.provideCodeActions(mockDocument, mockRange, mockContext) - expect(actions).toHaveLength(7) // 2 explain + 2 fix logic + 2 improve + 1 add to context + expect(actions).toHaveLength(1) expect((actions as any)[0].title).toBe(ACTION_NAMES.ADD_TO_CONTEXT) - expect((actions as any)[1].title).toBe(`${ACTION_NAMES.EXPLAIN} in New Task`) - expect((actions as any)[2].title).toBe(`${ACTION_NAMES.EXPLAIN} in Current Task`) - expect((actions as any)[3].title).toBe(`${ACTION_NAMES.FIX_LOGIC} in New Task`) - expect((actions as any)[4].title).toBe(`${ACTION_NAMES.FIX_LOGIC} in Current Task`) - expect((actions as any)[5].title).toBe(`${ACTION_NAMES.IMPROVE} in New Task`) - expect((actions as any)[6].title).toBe(`${ACTION_NAMES.IMPROVE} in Current Task`) }) it("should provide fix action instead of fix logic when diagnostics exist", () => { mockContext.diagnostics = [ - { - message: "test error", - severity: vscode.DiagnosticSeverity.Error, - range: mockRange, - }, + { message: "test error", severity: vscode.DiagnosticSeverity.Error, range: mockRange }, ] const actions = provider.provideCodeActions(mockDocument, mockRange, mockContext) - expect(actions).toHaveLength(7) // 2 explain + 2 fix + 2 improve + 1 add to context - expect((actions as any).some((a: any) => a.title === `${ACTION_NAMES.FIX} in New Task`)).toBe(true) - expect((actions as any).some((a: any) => a.title === `${ACTION_NAMES.FIX} in Current Task`)).toBe(true) - expect((actions as any).some((a: any) => a.title === `${ACTION_NAMES.FIX_LOGIC} in New Task`)).toBe(false) - expect((actions as any).some((a: any) => a.title === `${ACTION_NAMES.FIX_LOGIC} in Current Task`)).toBe( - false, - ) + expect(actions).toHaveLength(2) + expect((actions as any).some((a: any) => a.title === `${ACTION_NAMES.FIX}`)).toBe(true) + expect((actions as any).some((a: any) => a.title === `${ACTION_NAMES.ADD_TO_CONTEXT}`)).toBe(true) }) it("should return empty array when no effective range", () => { diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index 86e3b9d64d5..9aff5817e73 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -279,17 +279,7 @@ export class ClineProvider extends EventEmitter implements const prompt = supportPrompt.create(promptType, params, customSupportPrompts) if (command.endsWith("addToContext")) { - await visibleProvider.postMessageToWebview({ - type: "invoke", - invoke: "setChatBoxMessage", - text: prompt, - }) - - return - } - - if (visibleProvider.getCurrentCline() && command.endsWith("InCurrentTask")) { - await visibleProvider.postMessageToWebview({ type: "invoke", invoke: "sendMessage", text: prompt }) + await visibleProvider.postMessageToWebview({ type: "invoke", invoke: "setChatBoxMessage", text: prompt }) return } diff --git a/webview-ui/package-lock.json b/webview-ui/package-lock.json index abd6901452f..28ee6f2797b 100644 --- a/webview-ui/package-lock.json +++ b/webview-ui/package-lock.json @@ -48,6 +48,7 @@ "remark-gfm": "^4.0.1", "remove-markdown": "^0.6.0", "shell-quote": "^1.8.2", + "shiki": "^3.2.1", "styled-components": "^6.1.13", "tailwind-merge": "^2.6.0", "tailwindcss": "^4.0.0", @@ -82,7 +83,6 @@ "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "jest-simple-dot-reporter": "^1.0.5", - "shiki": "^2.3.2", "storybook": "^8.5.6", "storybook-dark-mode": "^4.0.2", "ts-jest": "^29.2.5", @@ -5908,79 +5908,70 @@ "license": "MIT" }, "node_modules/@shikijs/core": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-2.3.2.tgz", - "integrity": "sha512-s7vyL3LzUKm3Qwf36zRWlavX9BQMZTIq9B1almM63M5xBuSldnsTHCmsXzoF/Kyw4k7Xgas7yAyJz9VR/vcP1A==", - "dev": true, + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-3.3.0.tgz", + "integrity": "sha512-CovkFL2WVaHk6PCrwv6ctlmD4SS1qtIfN8yEyDXDYWh4ONvomdM9MaFw20qHuqJOcb8/xrkqoWQRJ//X10phOQ==", "license": "MIT", "dependencies": { - "@shikijs/engine-javascript": "2.3.2", - "@shikijs/engine-oniguruma": "2.3.2", - "@shikijs/types": "2.3.2", - "@shikijs/vscode-textmate": "^10.0.1", + "@shikijs/types": "3.3.0", + "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4", - "hast-util-to-html": "^9.0.4" + "hast-util-to-html": "^9.0.5" } }, "node_modules/@shikijs/engine-javascript": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-2.3.2.tgz", - "integrity": "sha512-w3IEMu5HfL/OaJTsMbIfZ1HRPnWVYRANeDtmsdIIEgUOcLjzFJFQwlnkckGjKHekEzNqlMLbgB/twnfZ/EEAGg==", - "dev": true, + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-3.3.0.tgz", + "integrity": "sha512-XlhnFGv0glq7pfsoN0KyBCz9FJU678LZdQ2LqlIdAj6JKsg5xpYKay3DkazXWExp3DTJJK9rMOuGzU2911pg7Q==", "license": "MIT", "dependencies": { - "@shikijs/types": "2.3.2", - "@shikijs/vscode-textmate": "^10.0.1", - "oniguruma-to-es": "^3.1.0" + "@shikijs/types": "3.3.0", + "@shikijs/vscode-textmate": "^10.0.2", + "oniguruma-to-es": "^4.2.0" } }, "node_modules/@shikijs/engine-oniguruma": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-2.3.2.tgz", - "integrity": "sha512-vikMY1TroyZXUHIXbMnvY/mjtOxMn+tavcfAeQPgWS9FHcgFSUoEtywF5B5sOLb9NXb8P2vb7odkh3nj15/00A==", - "dev": true, + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.3.0.tgz", + "integrity": "sha512-l0vIw+GxeNU7uGnsu6B+Crpeqf+WTQ2Va71cHb5ZYWEVEPdfYwY5kXwYqRJwHrxz9WH+pjSpXQz+TJgAsrkA5A==", "license": "MIT", "dependencies": { - "@shikijs/types": "2.3.2", - "@shikijs/vscode-textmate": "^10.0.1" + "@shikijs/types": "3.3.0", + "@shikijs/vscode-textmate": "^10.0.2" } }, "node_modules/@shikijs/langs": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-2.3.2.tgz", - "integrity": "sha512-UqI6bSxFzhexIJficZLKeB1L2Sc3xoNiAV0yHpfbg5meck93du+EKQtsGbBv66Ki53XZPhnR/kYkOr85elIuFw==", - "dev": true, + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.3.0.tgz", + "integrity": "sha512-zt6Kf/7XpBQKSI9eqku+arLkAcDQ3NHJO6zFjiChI8w0Oz6Jjjay7pToottjQGjSDCFk++R85643WbyINcuL+g==", "license": "MIT", "dependencies": { - "@shikijs/types": "2.3.2" + "@shikijs/types": "3.3.0" } }, "node_modules/@shikijs/themes": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-2.3.2.tgz", - "integrity": "sha512-QAh7D/hhfYKHibkG2tti8vxNt3ekAH5EqkXJeJbTh7FGvTCWEI7BHqNCtMdjFvZ0vav5nvUgdvA7/HI7pfsB4w==", - "dev": true, + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.3.0.tgz", + "integrity": "sha512-tXeCvLXBnqq34B0YZUEaAD1lD4lmN6TOHAhnHacj4Owh7Ptb/rf5XCDeROZt2rEOk5yuka3OOW2zLqClV7/SOg==", "license": "MIT", "dependencies": { - "@shikijs/types": "2.3.2" + "@shikijs/types": "3.3.0" } }, "node_modules/@shikijs/types": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-2.3.2.tgz", - "integrity": "sha512-CBaMY+a3pepyC4SETi7+bSzO0f6hxEQJUUuS4uD7zppzjmrN4ZRtBqxaT+wOan26CR9eeJ5iBhc4qvWEwn7Eeg==", - "dev": true, + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.3.0.tgz", + "integrity": "sha512-KPCGnHG6k06QG/2pnYGbFtFvpVJmC3uIpXrAiPrawETifujPBv0Se2oUxm5qYgjCvGJS9InKvjytOdN+bGuX+Q==", "license": "MIT", "dependencies": { - "@shikijs/vscode-textmate": "^10.0.1", + "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "node_modules/@shikijs/vscode-textmate": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.1.tgz", - "integrity": "sha512-fTIQwLF+Qhuws31iw7Ncl1R3HUDtGwIipiJ9iU+UsDUwMhegFcQKQHd51nZjb7CArq0MvON8rbgCGQYWHUKAdg==", - "dev": true, + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz", + "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==", "license": "MIT" }, "node_modules/@sinclair/typebox": { @@ -10539,13 +10530,6 @@ "dev": true, "license": "MIT" }, - "node_modules/emoji-regex-xs": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz", - "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==", - "dev": true, - "license": "MIT" - }, "node_modules/enhanced-resolve": { "version": "5.18.0", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz", @@ -12813,10 +12797,9 @@ } }, "node_modules/hast-util-to-html": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.4.tgz", - "integrity": "sha512-wxQzXtdbhiwGAUKrnQJXlOPmHnEehzphwkK7aluUPQ+lEc1xefC8pblMgpp2w5ldBTEfveRIrADcrhGIWrlTDA==", - "dev": true, + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.5.tgz", + "integrity": "sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==", "license": "MIT", "dependencies": { "@types/hast": "^3.0.0", @@ -12826,7 +12809,7 @@ "hast-util-whitespace": "^3.0.0", "html-void-elements": "^3.0.0", "mdast-util-to-hast": "^13.0.0", - "property-information": "^6.0.0", + "property-information": "^7.0.0", "space-separated-tokens": "^2.0.0", "stringify-entities": "^4.0.0", "zwitch": "^2.0.4" @@ -12840,7 +12823,6 @@ "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz", "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==", - "dev": true, "license": "MIT", "dependencies": { "@types/unist": "*" @@ -12850,7 +12832,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz", "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==", - "dev": true, "license": "MIT", "funding": { "type": "github", @@ -12861,7 +12842,6 @@ "version": "13.2.0", "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz", "integrity": "sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==", - "dev": true, "license": "MIT", "dependencies": { "@types/hast": "^3.0.0", @@ -12880,10 +12860,9 @@ } }, "node_modules/hast-util-to-html/node_modules/property-information": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz", - "integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==", - "dev": true, + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.0.0.tgz", + "integrity": "sha512-7D/qOz/+Y4X/rzSB6jKxKUsQnphO046ei8qxG59mtM3RG3DHgTK81HrxrmoDVINJb8NKT5ZsRbwHvQ6B68Iyhg==", "license": "MIT", "funding": { "type": "github", @@ -12894,7 +12873,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz", "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==", - "dev": true, "license": "MIT", "funding": { "type": "github", @@ -12905,7 +12883,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz", "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==", - "dev": true, "license": "MIT", "dependencies": { "@types/unist": "^3.0.0" @@ -13080,7 +13057,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz", "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==", - "dev": true, "license": "MIT", "funding": { "type": "github", @@ -18055,14 +18031,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/oniguruma-parser": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/oniguruma-parser/-/oniguruma-parser-0.12.0.tgz", + "integrity": "sha512-fD9o5ebCmEAA9dLysajdQvuKzLL7cj+w7DQjuO3Cb6IwafENfx6iL+RGkmyW82pVRsvgzixsWinHvgxTMJvdIA==", + "license": "MIT" + }, "node_modules/oniguruma-to-es": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-3.1.0.tgz", - "integrity": "sha512-BJ3Jy22YlgejHSO7Fvmz1kKazlaPmRSUH+4adTDUS/dKQ4wLxI+gALZ8updbaux7/m7fIlpgOZ5fp/Inq5jUAw==", - "dev": true, + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-4.3.1.tgz", + "integrity": "sha512-VtX1kepWO+7HG7IWV5v72JhiqofK7XsiHmtgnvurnNOTdIvE5mrdWYtsOrQyrXCv1L2Ckm08hywp+MFO7rC4Ug==", "license": "MIT", "dependencies": { - "emoji-regex-xs": "^1.0.0", + "oniguruma-parser": "^0.12.0", "regex": "^6.0.1", "regex-recursion": "^6.0.2" } @@ -19309,7 +19290,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/regex/-/regex-6.0.1.tgz", "integrity": "sha512-uorlqlzAKjKQZ5P+kTJr3eeJGSVroLKoHmquUj4zHWuR+hEyNqlXsSKlYYF5F4NI6nl7tWCs0apKJ0lmfsXAPA==", - "dev": true, "license": "MIT", "dependencies": { "regex-utilities": "^2.3.0" @@ -19319,7 +19299,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz", "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==", - "dev": true, "license": "MIT", "dependencies": { "regex-utilities": "^2.3.0" @@ -19329,7 +19308,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz", "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==", - "dev": true, "license": "MIT" }, "node_modules/regexp.prototype.flags": { @@ -20137,19 +20115,18 @@ } }, "node_modules/shiki": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-2.3.2.tgz", - "integrity": "sha512-UZhz/gsUz7DHFbQBOJP7eXqvKyYvMGramxQiSDc83M/7OkWm6OdVHAReEc3vMLh6L6TRhgL9dvhXz9XDkCDaaw==", - "dev": true, + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-3.3.0.tgz", + "integrity": "sha512-j0Z1tG5vlOFGW8JVj0Cpuatzvshes7VJy5ncDmmMaYcmnGW0Js1N81TOW98ivTFNZfKRn9uwEg/aIm638o368g==", "license": "MIT", "dependencies": { - "@shikijs/core": "2.3.2", - "@shikijs/engine-javascript": "2.3.2", - "@shikijs/engine-oniguruma": "2.3.2", - "@shikijs/langs": "2.3.2", - "@shikijs/themes": "2.3.2", - "@shikijs/types": "2.3.2", - "@shikijs/vscode-textmate": "^10.0.1", + "@shikijs/core": "3.3.0", + "@shikijs/engine-javascript": "3.3.0", + "@shikijs/engine-oniguruma": "3.3.0", + "@shikijs/langs": "3.3.0", + "@shikijs/themes": "3.3.0", + "@shikijs/types": "3.3.0", + "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx index 20ffc73c3f0..a12dae1a894 100644 --- a/webview-ui/src/components/chat/ChatView.tsx +++ b/webview-ui/src/components/chat/ChatView.tsx @@ -401,6 +401,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction { // Avoid nested template literals by breaking down the logic let newValue = text + if (inputValue !== "") { newValue = inputValue + " " + text } From 0a970be5a7a070fa4394dd54da0e1385ccbf8671 Mon Sep 17 00:00:00 2001 From: cte Date: Mon, 28 Apr 2025 23:25:36 -0700 Subject: [PATCH 2/7] Remove unused keys --- e2e/src/suite/extension.test.ts | 2 -- package.json | 22 ---------------------- package.nls.ca.json | 2 -- package.nls.de.json | 2 -- package.nls.es.json | 2 -- package.nls.fr.json | 2 -- package.nls.hi.json | 2 -- package.nls.it.json | 2 -- package.nls.ja.json | 2 -- package.nls.json | 2 -- package.nls.ko.json | 2 -- package.nls.pl.json | 2 -- package.nls.pt-BR.json | 2 -- package.nls.ru.json | 2 -- package.nls.tr.json | 2 -- package.nls.vi.json | 2 -- package.nls.zh-CN.json | 2 -- package.nls.zh-TW.json | 2 -- src/core/CodeActionProvider.ts | 2 +- 19 files changed, 1 insertion(+), 57 deletions(-) diff --git a/e2e/src/suite/extension.test.ts b/e2e/src/suite/extension.test.ts index 1f448246102..222511023e4 100644 --- a/e2e/src/suite/extension.test.ts +++ b/e2e/src/suite/extension.test.ts @@ -10,9 +10,7 @@ suite("Roo Code Extension", () => { "roo-cline.popoutButtonClicked", "roo-cline.settingsButtonClicked", "roo-cline.openInNewTab", - "roo-cline.explainCode", "roo-cline.fixCode", - "roo-cline.improveCode", ] const commands = await vscode.commands.getCommands(true) diff --git a/package.json b/package.json index 3c82f454d39..02f57e1133b 100644 --- a/package.json +++ b/package.json @@ -120,21 +120,11 @@ "title": "%command.openInNewTab.title%", "category": "%configuration.title%" }, - { - "command": "roo-cline.explainCode", - "title": "%command.explainCode.title%", - "category": "%configuration.title%" - }, { "command": "roo-cline.fixCode", "title": "%command.fixCode.title%", "category": "%configuration.title%" }, - { - "command": "roo-cline.improveCode", - "title": "%command.improveCode.title%", - "category": "%configuration.title%" - }, { "command": "roo-cline.addToContext", "title": "%command.addToContext.title%", @@ -197,18 +187,6 @@ { "command": "roo-cline.addToContext", "group": "1_actions@1" - }, - { - "command": "roo-cline.explainCode", - "group": "1_actions@2" - }, - { - "command": "roo-cline.fixCode", - "group": "1_actions@3" - }, - { - "command": "roo-cline.improveCode", - "group": "1_actions@4" } ], "terminal/context": [ diff --git a/package.nls.ca.json b/package.nls.ca.json index 19674829738..2e19d0c2b36 100644 --- a/package.nls.ca.json +++ b/package.nls.ca.json @@ -2,9 +2,7 @@ "extension.displayName": "Roo Code (abans Roo Cline)", "extension.description": "Un equip complet de desenvolupament d'agents d'IA al teu editor.", "command.newTask.title": "Nova Tasca", - "command.explainCode.title": "Explicar Codi", "command.fixCode.title": "Corregir Codi", - "command.improveCode.title": "Millorar Codi", "command.addToContext.title": "Afegir al Context", "command.openInNewTab.title": "Obrir en una Nova Pestanya", "command.focusInput.title": "Enfocar Camp d'Entrada", diff --git a/package.nls.de.json b/package.nls.de.json index 0207fa92dfc..f7ee3de9ead 100644 --- a/package.nls.de.json +++ b/package.nls.de.json @@ -2,9 +2,7 @@ "extension.displayName": "Roo Code (ehemals Roo Cline)", "extension.description": "Ein komplettes KI-Agenten-Entwicklungsteam in deinem Editor.", "command.newTask.title": "Neue Aufgabe", - "command.explainCode.title": "Code Erklären", "command.fixCode.title": "Code Reparieren", - "command.improveCode.title": "Code Verbessern", "command.addToContext.title": "Zum Kontext Hinzufügen", "command.openInNewTab.title": "In Neuem Tab Öffnen", "command.focusInput.title": "Eingabefeld Fokussieren", diff --git a/package.nls.es.json b/package.nls.es.json index 752846b5cf7..a48e085ac4c 100644 --- a/package.nls.es.json +++ b/package.nls.es.json @@ -2,9 +2,7 @@ "extension.displayName": "Roo Code (antes Roo Cline)", "extension.description": "Un equipo completo de desarrollo de agentes de IA en tu editor.", "command.newTask.title": "Nueva Tarea", - "command.explainCode.title": "Explicar Código", "command.fixCode.title": "Corregir Código", - "command.improveCode.title": "Mejorar Código", "command.addToContext.title": "Añadir al Contexto", "command.openInNewTab.title": "Abrir en Nueva Pestaña", "command.focusInput.title": "Enfocar Campo de Entrada", diff --git a/package.nls.fr.json b/package.nls.fr.json index d7ab199df80..fc49bf0d922 100644 --- a/package.nls.fr.json +++ b/package.nls.fr.json @@ -2,9 +2,7 @@ "extension.displayName": "Roo Code (anciennement Roo Cline)", "extension.description": "Une équipe complète de développement d'agents IA dans votre éditeur.", "command.newTask.title": "Nouvelle Tâche", - "command.explainCode.title": "Expliquer le Code", "command.fixCode.title": "Corriger le Code", - "command.improveCode.title": "Améliorer le Code", "command.addToContext.title": "Ajouter au Contexte", "command.openInNewTab.title": "Ouvrir dans un Nouvel Onglet", "command.focusInput.title": "Focus sur le Champ de Saisie", diff --git a/package.nls.hi.json b/package.nls.hi.json index 50419a6b1e0..bebc789762c 100644 --- a/package.nls.hi.json +++ b/package.nls.hi.json @@ -2,9 +2,7 @@ "extension.displayName": "Roo Code (पहले Roo Cline)", "extension.description": "आपके एडिटर में एआई एजेंट्स की पूरी डेवलपमेंट टीम।", "command.newTask.title": "नया कार्य", - "command.explainCode.title": "कोड समझाएं", "command.fixCode.title": "कोड ठीक करें", - "command.improveCode.title": "कोड सुधारें", "command.addToContext.title": "संदर्भ में जोड़ें", "command.openInNewTab.title": "नए टैब में खोलें", "command.focusInput.title": "इनपुट फ़ील्ड पर फोकस करें", diff --git a/package.nls.it.json b/package.nls.it.json index 32b47a8a1ac..841548a47c7 100644 --- a/package.nls.it.json +++ b/package.nls.it.json @@ -2,9 +2,7 @@ "extension.displayName": "Roo Code (precedentemente Roo Cline)", "extension.description": "Un intero team di sviluppo di agenti IA nel tuo editor.", "command.newTask.title": "Nuovo Task", - "command.explainCode.title": "Spiega Codice", "command.fixCode.title": "Correggi Codice", - "command.improveCode.title": "Migliora Codice", "command.addToContext.title": "Aggiungi al Contesto", "command.openInNewTab.title": "Apri in Nuova Scheda", "command.focusInput.title": "Focalizza Campo di Input", diff --git a/package.nls.ja.json b/package.nls.ja.json index 76eb5246fa7..3c323a149ac 100644 --- a/package.nls.ja.json +++ b/package.nls.ja.json @@ -12,9 +12,7 @@ "command.settings.title": "設定", "command.documentation.title": "ドキュメント", "command.openInNewTab.title": "新しいタブで開く", - "command.explainCode.title": "コードの説明", "command.fixCode.title": "コードの修正", - "command.improveCode.title": "コードの改善", "command.addToContext.title": "コンテキストに追加", "command.focusInput.title": "入力フィールドにフォーカス", "command.setCustomStoragePath.title": "カスタムストレージパスの設定", diff --git a/package.nls.json b/package.nls.json index 9a63a421efc..fd386efb80d 100644 --- a/package.nls.json +++ b/package.nls.json @@ -12,9 +12,7 @@ "command.settings.title": "Settings", "command.documentation.title": "Documentation", "command.openInNewTab.title": "Open In New Tab", - "command.explainCode.title": "Explain Code", "command.fixCode.title": "Fix Code", - "command.improveCode.title": "Improve Code", "command.addToContext.title": "Add To Context", "command.focusInput.title": "Focus Input Field", "command.setCustomStoragePath.title": "Set Custom Storage Path", diff --git a/package.nls.ko.json b/package.nls.ko.json index 598aa075ef8..9973d0d7398 100644 --- a/package.nls.ko.json +++ b/package.nls.ko.json @@ -2,9 +2,7 @@ "extension.displayName": "Roo Code (이전 Roo Cline)", "extension.description": "에디터에서 작동하는 AI 에이전트 개발팀.", "command.newTask.title": "새 작업", - "command.explainCode.title": "코드 설명", "command.fixCode.title": "코드 수정", - "command.improveCode.title": "코드 개선", "command.addToContext.title": "컨텍스트에 추가", "command.openInNewTab.title": "새 탭에서 열기", "command.focusInput.title": "입력 필드 포커스", diff --git a/package.nls.pl.json b/package.nls.pl.json index 86661c7cbe3..ab265c14431 100644 --- a/package.nls.pl.json +++ b/package.nls.pl.json @@ -2,9 +2,7 @@ "extension.displayName": "Roo Code (wcześniej Roo Cline)", "extension.description": "Pełny zespół programistów AI w twoim edytorze.", "command.newTask.title": "Nowe Zadanie", - "command.explainCode.title": "Wyjaśnij Kod", "command.fixCode.title": "Napraw Kod", - "command.improveCode.title": "Ulepsz Kod", "command.addToContext.title": "Dodaj do Kontekstu", "command.openInNewTab.title": "Otwórz w Nowej Karcie", "command.focusInput.title": "Fokus na Pole Wprowadzania", diff --git a/package.nls.pt-BR.json b/package.nls.pt-BR.json index 0664f51000a..04c16c24aa3 100644 --- a/package.nls.pt-BR.json +++ b/package.nls.pt-BR.json @@ -2,9 +2,7 @@ "extension.displayName": "Roo Code (anteriormente Roo Cline)", "extension.description": "Uma equipe completa de desenvolvimento de agentes de IA no seu editor.", "command.newTask.title": "Nova Tarefa", - "command.explainCode.title": "Explicar Código", "command.fixCode.title": "Corrigir Código", - "command.improveCode.title": "Melhorar Código", "command.addToContext.title": "Adicionar ao Contexto", "command.openInNewTab.title": "Abrir em Nova Aba", "command.focusInput.title": "Focar Campo de Entrada", diff --git a/package.nls.ru.json b/package.nls.ru.json index 97c041a1b67..98d7233a789 100644 --- a/package.nls.ru.json +++ b/package.nls.ru.json @@ -12,9 +12,7 @@ "command.settings.title": "Настройки", "command.documentation.title": "Документация", "command.openInNewTab.title": "Открыть в новой вкладке", - "command.explainCode.title": "Объяснить код", "command.fixCode.title": "Исправить код", - "command.improveCode.title": "Улучшить код", "command.addToContext.title": "Добавить в контекст", "command.focusInput.title": "Фокус на поле ввода", "command.setCustomStoragePath.title": "Указать путь хранения", diff --git a/package.nls.tr.json b/package.nls.tr.json index e1ed1f8871b..7758c3e5840 100644 --- a/package.nls.tr.json +++ b/package.nls.tr.json @@ -2,9 +2,7 @@ "extension.displayName": "Roo Code (önceden Roo Cline)", "extension.description": "Düzenleyicinde tam bir AI ajanları geliştirme ekibi.", "command.newTask.title": "Yeni Görev", - "command.explainCode.title": "Kodu Açıkla", "command.fixCode.title": "Kodu Düzelt", - "command.improveCode.title": "Kodu İyileştir", "command.addToContext.title": "Bağlama Ekle", "command.openInNewTab.title": "Yeni Sekmede Aç", "command.focusInput.title": "Giriş Alanına Odaklan", diff --git a/package.nls.vi.json b/package.nls.vi.json index db06a3812ff..d0fad41ab2a 100644 --- a/package.nls.vi.json +++ b/package.nls.vi.json @@ -2,9 +2,7 @@ "extension.displayName": "Roo Code (trước đây là Roo Cline)", "extension.description": "Một đội ngũ phát triển các tác nhân AI hoàn chỉnh trong trình soạn thảo của bạn.", "command.newTask.title": "Tác Vụ Mới", - "command.explainCode.title": "Giải Thích Mã", "command.fixCode.title": "Sửa Mã", - "command.improveCode.title": "Cải Thiện Mã", "command.addToContext.title": "Thêm vào Ngữ Cảnh", "command.openInNewTab.title": "Mở trong Tab Mới", "command.focusInput.title": "Tập Trung vào Trường Nhập", diff --git a/package.nls.zh-CN.json b/package.nls.zh-CN.json index 9cd6198ac38..afe43a20c38 100644 --- a/package.nls.zh-CN.json +++ b/package.nls.zh-CN.json @@ -2,9 +2,7 @@ "extension.displayName": "Roo Code (原名 Roo Cline)", "extension.description": "在你的编辑器中提供完整的 AI 代理开发团队。", "command.newTask.title": "新建任务", - "command.explainCode.title": "解释代码", "command.fixCode.title": "修复代码", - "command.improveCode.title": "改进代码", "command.addToContext.title": "添加到上下文", "command.openInNewTab.title": "在新标签页中打开", "command.focusInput.title": "聚焦输入框", diff --git a/package.nls.zh-TW.json b/package.nls.zh-TW.json index 629d5f17906..2dc05de9eb0 100644 --- a/package.nls.zh-TW.json +++ b/package.nls.zh-TW.json @@ -2,9 +2,7 @@ "extension.displayName": "Roo Code (原名 Roo Cline)", "extension.description": "在你的編輯器中提供完整的 AI 代理開發團隊。", "command.newTask.title": "新建任務", - "command.explainCode.title": "解釋程式碼", "command.fixCode.title": "修復程式碼", - "command.improveCode.title": "改進程式碼", "command.addToContext.title": "添加到上下文", "command.openInNewTab.title": "在新分頁中開啟", "command.focusInput.title": "聚焦輸入框", diff --git a/src/core/CodeActionProvider.ts b/src/core/CodeActionProvider.ts index 42ce6397c4f..4dca1c7902c 100644 --- a/src/core/CodeActionProvider.ts +++ b/src/core/CodeActionProvider.ts @@ -5,7 +5,7 @@ import { EditorUtils } from "./EditorUtils" type CodeActionName = "FIX" | "ADD_TO_CONTEXT" | "NEW_TASK" export const ACTION_NAMES: Record = { - FIX: "Fix in Roo Code", + FIX: "Fix with Roo Code", ADD_TO_CONTEXT: "Add to Roo Code", NEW_TASK: "New Roo Code Task", } as const From 3dc5d6d381991e62855673eae4696e3cc27babb9 Mon Sep 17 00:00:00 2001 From: cte Date: Mon, 28 Apr 2025 23:37:25 -0700 Subject: [PATCH 3/7] Simplify more stuff --- package.json | 18 ----------- package.nls.ca.json | 2 -- package.nls.de.json | 2 -- package.nls.es.json | 2 -- package.nls.fr.json | 2 -- package.nls.hi.json | 2 -- package.nls.it.json | 2 -- package.nls.ja.json | 2 -- package.nls.json | 2 -- package.nls.ko.json | 2 -- package.nls.pl.json | 2 -- package.nls.pt-BR.json | 2 -- package.nls.ru.json | 2 -- package.nls.tr.json | 2 -- package.nls.vi.json | 2 -- package.nls.zh-CN.json | 2 -- package.nls.zh-TW.json | 2 -- src/activate/registerTerminalActions.ts | 40 ++++--------------------- src/core/webview/ClineProvider.ts | 16 ++-------- 19 files changed, 7 insertions(+), 99 deletions(-) diff --git a/package.json b/package.json index 02f57e1133b..98b42b45ee5 100644 --- a/package.json +++ b/package.json @@ -150,16 +150,6 @@ "title": "%command.terminal.explainCommand.title%", "category": "Terminal" }, - { - "command": "roo-cline.terminalFixCommandInCurrentTask", - "title": "%command.terminal.fixCommandInCurrentTask.title%", - "category": "Terminal" - }, - { - "command": "roo-cline.terminalExplainCommandInCurrentTask", - "title": "%command.terminal.explainCommandInCurrentTask.title%", - "category": "Terminal" - }, { "command": "roo-cline.setCustomStoragePath", "title": "%command.setCustomStoragePath.title%", @@ -207,14 +197,6 @@ { "command": "roo-cline.terminalExplainCommand", "group": "1_actions@3" - }, - { - "command": "roo-cline.terminalFixCommandInCurrentTask", - "group": "1_actions@5" - }, - { - "command": "roo-cline.terminalExplainCommandInCurrentTask", - "group": "1_actions@6" } ], "view/title": [ diff --git a/package.nls.ca.json b/package.nls.ca.json index 2e19d0c2b36..3d1e74ec045 100644 --- a/package.nls.ca.json +++ b/package.nls.ca.json @@ -10,8 +10,6 @@ "command.terminal.addToContext.title": "Afegir Contingut del Terminal al Context", "command.terminal.fixCommand.title": "Corregir Aquesta Ordre", "command.terminal.explainCommand.title": "Explicar Aquesta Ordre", - "command.terminal.fixCommandInCurrentTask.title": "Corregir Aquesta Ordre (Tasca Actual)", - "command.terminal.explainCommandInCurrentTask.title": "Explicar Aquesta Ordre (Tasca Actual)", "command.acceptInput.title": "Acceptar Entrada/Suggeriment", "views.activitybar.title": "Roo Code", "views.contextMenu.label": "Roo Code", diff --git a/package.nls.de.json b/package.nls.de.json index f7ee3de9ead..f9ba3d6fc2a 100644 --- a/package.nls.de.json +++ b/package.nls.de.json @@ -10,8 +10,6 @@ "command.terminal.addToContext.title": "Terminal-Inhalt zum Kontext Hinzufügen", "command.terminal.fixCommand.title": "Diesen Befehl Reparieren", "command.terminal.explainCommand.title": "Diesen Befehl Erklären", - "command.terminal.fixCommandInCurrentTask.title": "Diesen Befehl Reparieren (Aktuelle Aufgabe)", - "command.terminal.explainCommandInCurrentTask.title": "Diesen Befehl Erklären (Aktuelle Aufgabe)", "command.acceptInput.title": "Eingabe/Vorschlag Akzeptieren", "views.activitybar.title": "Roo Code", "views.contextMenu.label": "Roo Code", diff --git a/package.nls.es.json b/package.nls.es.json index a48e085ac4c..c2d8e4ce064 100644 --- a/package.nls.es.json +++ b/package.nls.es.json @@ -10,8 +10,6 @@ "command.terminal.addToContext.title": "Añadir Contenido de Terminal al Contexto", "command.terminal.fixCommand.title": "Corregir Este Comando", "command.terminal.explainCommand.title": "Explicar Este Comando", - "command.terminal.fixCommandInCurrentTask.title": "Corregir Este Comando (Tarea Actual)", - "command.terminal.explainCommandInCurrentTask.title": "Explicar Este Comando (Tarea Actual)", "command.acceptInput.title": "Aceptar Entrada/Sugerencia", "views.activitybar.title": "Roo Code", "views.contextMenu.label": "Roo Code", diff --git a/package.nls.fr.json b/package.nls.fr.json index fc49bf0d922..20c241c9f75 100644 --- a/package.nls.fr.json +++ b/package.nls.fr.json @@ -10,8 +10,6 @@ "command.terminal.addToContext.title": "Ajouter le Contenu du Terminal au Contexte", "command.terminal.fixCommand.title": "Corriger cette Commande", "command.terminal.explainCommand.title": "Expliquer cette Commande", - "command.terminal.fixCommandInCurrentTask.title": "Corriger cette Commande (Tâche Actuelle)", - "command.terminal.explainCommandInCurrentTask.title": "Expliquer cette Commande (Tâche Actuelle)", "command.acceptInput.title": "Accepter l'Entrée/Suggestion", "views.activitybar.title": "Roo Code", "views.contextMenu.label": "Roo Code", diff --git a/package.nls.hi.json b/package.nls.hi.json index bebc789762c..468fd1c4a6f 100644 --- a/package.nls.hi.json +++ b/package.nls.hi.json @@ -10,8 +10,6 @@ "command.terminal.addToContext.title": "टर्मिनल सामग्री को संदर्भ में जोड़ें", "command.terminal.fixCommand.title": "यह कमांड ठीक करें", "command.terminal.explainCommand.title": "यह कमांड समझाएं", - "command.terminal.fixCommandInCurrentTask.title": "यह कमांड ठीक करें (वर्तमान कार्य)", - "command.terminal.explainCommandInCurrentTask.title": "यह कमांड समझाएं (वर्तमान कार्य)", "command.acceptInput.title": "इनपुट/सुझाव स्वीकारें", "views.activitybar.title": "Roo Code", "views.contextMenu.label": "Roo Code", diff --git a/package.nls.it.json b/package.nls.it.json index 841548a47c7..5161513661f 100644 --- a/package.nls.it.json +++ b/package.nls.it.json @@ -10,8 +10,6 @@ "command.terminal.addToContext.title": "Aggiungi Contenuto del Terminale al Contesto", "command.terminal.fixCommand.title": "Correggi Questo Comando", "command.terminal.explainCommand.title": "Spiega Questo Comando", - "command.terminal.fixCommandInCurrentTask.title": "Correggi Questo Comando (Task Corrente)", - "command.terminal.explainCommandInCurrentTask.title": "Spiega Questo Comando (Task Corrente)", "command.acceptInput.title": "Accetta Input/Suggerimento", "views.activitybar.title": "Roo Code", "views.contextMenu.label": "Roo Code", diff --git a/package.nls.ja.json b/package.nls.ja.json index 3c323a149ac..10acec07fd9 100644 --- a/package.nls.ja.json +++ b/package.nls.ja.json @@ -19,8 +19,6 @@ "command.terminal.addToContext.title": "ターミナルの内容をコンテキストに追加", "command.terminal.fixCommand.title": "このコマンドを修正", "command.terminal.explainCommand.title": "このコマンドを説明", - "command.terminal.fixCommandInCurrentTask.title": "このコマンドを修正（現在のタスク）", - "command.terminal.explainCommandInCurrentTask.title": "このコマンドを説明（現在のタスク）", "command.acceptInput.title": "入力/提案を承認", "configuration.title": "Roo Code", "commands.allowedCommands.description": "'常に実行操作を承認する'が有効な場合に自動実行できるコマンド", diff --git a/package.nls.json b/package.nls.json index fd386efb80d..d3533f7cb6a 100644 --- a/package.nls.json +++ b/package.nls.json @@ -19,8 +19,6 @@ "command.terminal.addToContext.title": "Add Terminal Content to Context", "command.terminal.fixCommand.title": "Fix This Command", "command.terminal.explainCommand.title": "Explain This Command", - "command.terminal.fixCommandInCurrentTask.title": "Fix This Command (Current Task)", - "command.terminal.explainCommandInCurrentTask.title": "Explain This Command (Current Task)", "command.acceptInput.title": "Accept Input/Suggestion", "configuration.title": "Roo Code", "commands.allowedCommands.description": "Commands that can be auto-executed when 'Always approve execute operations' is enabled", diff --git a/package.nls.ko.json b/package.nls.ko.json index 9973d0d7398..bcc5c19c7e5 100644 --- a/package.nls.ko.json +++ b/package.nls.ko.json @@ -10,8 +10,6 @@ "command.terminal.addToContext.title": "터미널 내용을 컨텍스트에 추가", "command.terminal.fixCommand.title": "이 명령어 수정", "command.terminal.explainCommand.title": "이 명령어 설명", - "command.terminal.fixCommandInCurrentTask.title": "이 명령어 수정 (현재 작업)", - "command.terminal.explainCommandInCurrentTask.title": "이 명령어 설명 (현재 작업)", "command.acceptInput.title": "입력/제안 수락", "views.activitybar.title": "Roo Code", "views.contextMenu.label": "Roo Code", diff --git a/package.nls.pl.json b/package.nls.pl.json index ab265c14431..681be3c3d3e 100644 --- a/package.nls.pl.json +++ b/package.nls.pl.json @@ -10,8 +10,6 @@ "command.terminal.addToContext.title": "Dodaj Zawartość Terminala do Kontekstu", "command.terminal.fixCommand.title": "Napraw tę Komendę", "command.terminal.explainCommand.title": "Wyjaśnij tę Komendę", - "command.terminal.fixCommandInCurrentTask.title": "Napraw tę Komendę (Bieżące Zadanie)", - "command.terminal.explainCommandInCurrentTask.title": "Wyjaśnij tę Komendę (Bieżące Zadanie)", "command.acceptInput.title": "Akceptuj Wprowadzanie/Sugestię", "views.activitybar.title": "Roo Code", "views.contextMenu.label": "Roo Code", diff --git a/package.nls.pt-BR.json b/package.nls.pt-BR.json index 04c16c24aa3..2d155ae73c8 100644 --- a/package.nls.pt-BR.json +++ b/package.nls.pt-BR.json @@ -10,8 +10,6 @@ "command.terminal.addToContext.title": "Adicionar Conteúdo do Terminal ao Contexto", "command.terminal.fixCommand.title": "Corrigir Este Comando", "command.terminal.explainCommand.title": "Explicar Este Comando", - "command.terminal.fixCommandInCurrentTask.title": "Corrigir Este Comando (Tarefa Atual)", - "command.terminal.explainCommandInCurrentTask.title": "Explicar Este Comando (Tarefa Atual)", "command.acceptInput.title": "Aceitar Entrada/Sugestão", "views.activitybar.title": "Roo Code", "views.contextMenu.label": "Roo Code", diff --git a/package.nls.ru.json b/package.nls.ru.json index 98d7233a789..f1d7b85c9f3 100644 --- a/package.nls.ru.json +++ b/package.nls.ru.json @@ -19,8 +19,6 @@ "command.terminal.addToContext.title": "Добавить содержимое терминала в контекст", "command.terminal.fixCommand.title": "Исправить эту команду", "command.terminal.explainCommand.title": "Объяснить эту команду", - "command.terminal.fixCommandInCurrentTask.title": "Исправить эту команду (текущая задача)", - "command.terminal.explainCommandInCurrentTask.title": "Объяснить эту команду (текущая задача)", "command.acceptInput.title": "Принять ввод/предложение", "configuration.title": "Roo Code", "commands.allowedCommands.description": "Команды, которые могут быть автоматически выполнены, когда включена опция 'Всегда подтверждать операции выполнения'", diff --git a/package.nls.tr.json b/package.nls.tr.json index 7758c3e5840..2210f35c641 100644 --- a/package.nls.tr.json +++ b/package.nls.tr.json @@ -10,8 +10,6 @@ "command.terminal.addToContext.title": "Terminal İçeriğini Bağlama Ekle", "command.terminal.fixCommand.title": "Bu Komutu Düzelt", "command.terminal.explainCommand.title": "Bu Komutu Açıkla", - "command.terminal.fixCommandInCurrentTask.title": "Bu Komutu Düzelt (Mevcut Görev)", - "command.terminal.explainCommandInCurrentTask.title": "Bu Komutu Açıkla (Mevcut Görev)", "command.acceptInput.title": "Girişi/Öneriyi Kabul Et", "views.activitybar.title": "Roo Code", "views.contextMenu.label": "Roo Code", diff --git a/package.nls.vi.json b/package.nls.vi.json index d0fad41ab2a..c09a4b2f1f4 100644 --- a/package.nls.vi.json +++ b/package.nls.vi.json @@ -10,8 +10,6 @@ "command.terminal.addToContext.title": "Thêm Nội Dung Terminal vào Ngữ Cảnh", "command.terminal.fixCommand.title": "Sửa Lệnh Này", "command.terminal.explainCommand.title": "Giải Thích Lệnh Này", - "command.terminal.fixCommandInCurrentTask.title": "Sửa Lệnh Này (Tác Vụ Hiện Tại)", - "command.terminal.explainCommandInCurrentTask.title": "Giải Thích Lệnh Này (Tác Vụ Hiện Tại)", "command.acceptInput.title": "Chấp Nhận Đầu Vào/Gợi Ý", "views.activitybar.title": "Roo Code", "views.contextMenu.label": "Roo Code", diff --git a/package.nls.zh-CN.json b/package.nls.zh-CN.json index afe43a20c38..4bac1d10047 100644 --- a/package.nls.zh-CN.json +++ b/package.nls.zh-CN.json @@ -10,8 +10,6 @@ "command.terminal.addToContext.title": "将终端内容添加到上下文", "command.terminal.fixCommand.title": "修复此命令", "command.terminal.explainCommand.title": "解释此命令", - "command.terminal.fixCommandInCurrentTask.title": "修复此命令（当前任务）", - "command.terminal.explainCommandInCurrentTask.title": "解释此命令（当前任务）", "command.acceptInput.title": "接受输入/建议", "views.activitybar.title": "Roo Code", "views.contextMenu.label": "Roo Code", diff --git a/package.nls.zh-TW.json b/package.nls.zh-TW.json index 2dc05de9eb0..4b16db9efe7 100644 --- a/package.nls.zh-TW.json +++ b/package.nls.zh-TW.json @@ -10,8 +10,6 @@ "command.terminal.addToContext.title": "將終端內容添加到上下文", "command.terminal.fixCommand.title": "修復此命令", "command.terminal.explainCommand.title": "解釋此命令", - "command.terminal.fixCommandInCurrentTask.title": "修復此命令（當前任務）", - "command.terminal.explainCommandInCurrentTask.title": "解釋此命令（當前任務）", "command.acceptInput.title": "接受輸入/建議", "views.activitybar.title": "Roo Code", "views.contextMenu.label": "Roo Code", diff --git a/src/activate/registerTerminalActions.ts b/src/activate/registerTerminalActions.ts index 6c3a3f260f6..40d30afc61f 100644 --- a/src/activate/registerTerminalActions.ts +++ b/src/activate/registerTerminalActions.ts @@ -6,33 +6,24 @@ import { t } from "../i18n" const TERMINAL_COMMAND_IDS = { ADD_TO_CONTEXT: "roo-cline.terminalAddToContext", FIX: "roo-cline.terminalFixCommand", - FIX_IN_CURRENT_TASK: "roo-cline.terminalFixCommandInCurrentTask", EXPLAIN: "roo-cline.terminalExplainCommand", - EXPLAIN_IN_CURRENT_TASK: "roo-cline.terminalExplainCommandInCurrentTask", } as const export const registerTerminalActions = (context: vscode.ExtensionContext) => { registerTerminalAction(context, TERMINAL_COMMAND_IDS.ADD_TO_CONTEXT, "TERMINAL_ADD_TO_CONTEXT") - - registerTerminalActionPair(context, TERMINAL_COMMAND_IDS.FIX, "TERMINAL_FIX", "What would you like Roo to fix?") - - registerTerminalActionPair( - context, - TERMINAL_COMMAND_IDS.EXPLAIN, - "TERMINAL_EXPLAIN", - "What would you like Roo to explain?", - ) + registerTerminalAction(context, TERMINAL_COMMAND_IDS.FIX, "TERMINAL_FIX") + registerTerminalAction(context, TERMINAL_COMMAND_IDS.EXPLAIN, "TERMINAL_EXPLAIN") } const registerTerminalAction = ( context: vscode.ExtensionContext, command: string, promptType: "TERMINAL_ADD_TO_CONTEXT" | "TERMINAL_FIX" | "TERMINAL_EXPLAIN", - inputPrompt?: string, ) => { context.subscriptions.push( vscode.commands.registerCommand(command, async (args: any) => { let content = args.selection + if (!content || content === "") { content = await Terminal.getTerminalContents(promptType === "TERMINAL_ADD_TO_CONTEXT" ? -1 : 1) } @@ -42,30 +33,9 @@ const registerTerminalAction = ( return } - const params: Record = { + await ClineProvider.handleTerminalAction(command, promptType, { terminalContent: content, - } - - if (inputPrompt) { - params.userInput = - (await vscode.window.showInputBox({ - prompt: inputPrompt, - })) ?? "" - } - - await ClineProvider.handleTerminalAction(command, promptType, params) + }) }), ) } - -const registerTerminalActionPair = ( - context: vscode.ExtensionContext, - baseCommand: string, - promptType: "TERMINAL_ADD_TO_CONTEXT" | "TERMINAL_FIX" | "TERMINAL_EXPLAIN", - inputPrompt?: string, -) => { - // Register new task version - registerTerminalAction(context, baseCommand, promptType, inputPrompt) - // Register current task version - registerTerminalAction(context, `${baseCommand}InCurrentTask`, promptType, inputPrompt) -} diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index 9aff5817e73..f6bb3afb3de 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -294,6 +294,7 @@ export class ClineProvider extends EventEmitter implements // Capture telemetry for terminal action usage telemetryService.captureCodeActionUsed(promptType) const visibleProvider = await ClineProvider.getInstance() + if (!visibleProvider) { return } @@ -303,20 +304,7 @@ export class ClineProvider extends EventEmitter implements const prompt = supportPrompt.create(promptType, params, customSupportPrompts) if (command.endsWith("AddToContext")) { - await visibleProvider.postMessageToWebview({ - type: "invoke", - invoke: "setChatBoxMessage", - text: prompt, - }) - return - } - - if (visibleProvider.getCurrentCline() && command.endsWith("InCurrentTask")) { - await visibleProvider.postMessageToWebview({ - type: "invoke", - invoke: "sendMessage", - text: prompt, - }) + await visibleProvider.postMessageToWebview({ type: "invoke", invoke: "setChatBoxMessage", text: prompt }) return } From 6aae606ed1e7f3fb559742226f8cfc772f8dfb4f Mon Sep 17 00:00:00 2001 From: cte Date: Mon, 28 Apr 2025 23:54:49 -0700 Subject: [PATCH 4/7] Bring back "Explain Code" --- e2e/src/suite/extension.test.ts | 1 + package.json | 9 +++++++++ package.nls.ca.json | 1 + package.nls.de.json | 1 + package.nls.es.json | 1 + package.nls.fr.json | 1 + package.nls.hi.json | 1 + package.nls.it.json | 1 + package.nls.ja.json | 1 + package.nls.json | 1 + package.nls.ko.json | 1 + package.nls.pl.json | 1 + package.nls.pt-BR.json | 1 + package.nls.ru.json | 1 + package.nls.tr.json | 1 + package.nls.vi.json | 1 + package.nls.zh-CN.json | 1 + package.nls.zh-TW.json | 1 + src/core/CodeActionProvider.ts | 13 ++++++++++++- 19 files changed, 38 insertions(+), 1 deletion(-) diff --git a/e2e/src/suite/extension.test.ts b/e2e/src/suite/extension.test.ts index 222511023e4..f8ce320df55 100644 --- a/e2e/src/suite/extension.test.ts +++ b/e2e/src/suite/extension.test.ts @@ -10,6 +10,7 @@ suite("Roo Code Extension", () => { "roo-cline.popoutButtonClicked", "roo-cline.settingsButtonClicked", "roo-cline.openInNewTab", + "roo-cline.explainCode", "roo-cline.fixCode", ] diff --git a/package.json b/package.json index 98b42b45ee5..861b35df94e 100644 --- a/package.json +++ b/package.json @@ -120,6 +120,11 @@ "title": "%command.openInNewTab.title%", "category": "%configuration.title%" }, + { + "command": "roo-cline.explainCode", + "title": "%command.explainCode.title%", + "category": "%configuration.title%" + }, { "command": "roo-cline.fixCode", "title": "%command.fixCode.title%", @@ -177,6 +182,10 @@ { "command": "roo-cline.addToContext", "group": "1_actions@1" + }, + { + "command": "roo-cline.explainCode", + "group": "1_actions@2" } ], "terminal/context": [ diff --git a/package.nls.ca.json b/package.nls.ca.json index 3d1e74ec045..293a2ac0b59 100644 --- a/package.nls.ca.json +++ b/package.nls.ca.json @@ -2,6 +2,7 @@ "extension.displayName": "Roo Code (abans Roo Cline)", "extension.description": "Un equip complet de desenvolupament d'agents d'IA al teu editor.", "command.newTask.title": "Nova Tasca", + "command.explainCode.title": "Explicar Codi", "command.fixCode.title": "Corregir Codi", "command.addToContext.title": "Afegir al Context", "command.openInNewTab.title": "Obrir en una Nova Pestanya", diff --git a/package.nls.de.json b/package.nls.de.json index f9ba3d6fc2a..a35fa64dff6 100644 --- a/package.nls.de.json +++ b/package.nls.de.json @@ -2,6 +2,7 @@ "extension.displayName": "Roo Code (ehemals Roo Cline)", "extension.description": "Ein komplettes KI-Agenten-Entwicklungsteam in deinem Editor.", "command.newTask.title": "Neue Aufgabe", + "command.explainCode.title": "Code Erklären", "command.fixCode.title": "Code Reparieren", "command.addToContext.title": "Zum Kontext Hinzufügen", "command.openInNewTab.title": "In Neuem Tab Öffnen", diff --git a/package.nls.es.json b/package.nls.es.json index c2d8e4ce064..e0fd9ba09fc 100644 --- a/package.nls.es.json +++ b/package.nls.es.json @@ -2,6 +2,7 @@ "extension.displayName": "Roo Code (antes Roo Cline)", "extension.description": "Un equipo completo de desarrollo de agentes de IA en tu editor.", "command.newTask.title": "Nueva Tarea", + "command.explainCode.title": "Explicar Código", "command.fixCode.title": "Corregir Código", "command.addToContext.title": "Añadir al Contexto", "command.openInNewTab.title": "Abrir en Nueva Pestaña", diff --git a/package.nls.fr.json b/package.nls.fr.json index 20c241c9f75..b1f0aad1c9b 100644 --- a/package.nls.fr.json +++ b/package.nls.fr.json @@ -2,6 +2,7 @@ "extension.displayName": "Roo Code (anciennement Roo Cline)", "extension.description": "Une équipe complète de développement d'agents IA dans votre éditeur.", "command.newTask.title": "Nouvelle Tâche", + "command.explainCode.title": "Expliquer le Code", "command.fixCode.title": "Corriger le Code", "command.addToContext.title": "Ajouter au Contexte", "command.openInNewTab.title": "Ouvrir dans un Nouvel Onglet", diff --git a/package.nls.hi.json b/package.nls.hi.json index 468fd1c4a6f..490d7880168 100644 --- a/package.nls.hi.json +++ b/package.nls.hi.json @@ -2,6 +2,7 @@ "extension.displayName": "Roo Code (पहले Roo Cline)", "extension.description": "आपके एडिटर में एआई एजेंट्स की पूरी डेवलपमेंट टीम।", "command.newTask.title": "नया कार्य", + "command.explainCode.title": "कोड समझाएं", "command.fixCode.title": "कोड ठीक करें", "command.addToContext.title": "संदर्भ में जोड़ें", "command.openInNewTab.title": "नए टैब में खोलें", diff --git a/package.nls.it.json b/package.nls.it.json index 5161513661f..86ca00b21dd 100644 --- a/package.nls.it.json +++ b/package.nls.it.json @@ -2,6 +2,7 @@ "extension.displayName": "Roo Code (precedentemente Roo Cline)", "extension.description": "Un intero team di sviluppo di agenti IA nel tuo editor.", "command.newTask.title": "Nuovo Task", + "command.explainCode.title": "Spiega Codice", "command.fixCode.title": "Correggi Codice", "command.addToContext.title": "Aggiungi al Contesto", "command.openInNewTab.title": "Apri in Nuova Scheda", diff --git a/package.nls.ja.json b/package.nls.ja.json index 10acec07fd9..e15f81ed535 100644 --- a/package.nls.ja.json +++ b/package.nls.ja.json @@ -12,6 +12,7 @@ "command.settings.title": "設定", "command.documentation.title": "ドキュメント", "command.openInNewTab.title": "新しいタブで開く", + "command.explainCode.title": "コードの説明", "command.fixCode.title": "コードの修正", "command.addToContext.title": "コンテキストに追加", "command.focusInput.title": "入力フィールドにフォーカス", diff --git a/package.nls.json b/package.nls.json index d3533f7cb6a..452fc0a9515 100644 --- a/package.nls.json +++ b/package.nls.json @@ -12,6 +12,7 @@ "command.settings.title": "Settings", "command.documentation.title": "Documentation", "command.openInNewTab.title": "Open In New Tab", + "command.explainCode.title": "Explain Code", "command.fixCode.title": "Fix Code", "command.addToContext.title": "Add To Context", "command.focusInput.title": "Focus Input Field", diff --git a/package.nls.ko.json b/package.nls.ko.json index bcc5c19c7e5..35cba9a2dc0 100644 --- a/package.nls.ko.json +++ b/package.nls.ko.json @@ -2,6 +2,7 @@ "extension.displayName": "Roo Code (이전 Roo Cline)", "extension.description": "에디터에서 작동하는 AI 에이전트 개발팀.", "command.newTask.title": "새 작업", + "command.explainCode.title": "코드 설명", "command.fixCode.title": "코드 수정", "command.addToContext.title": "컨텍스트에 추가", "command.openInNewTab.title": "새 탭에서 열기", diff --git a/package.nls.pl.json b/package.nls.pl.json index 681be3c3d3e..5ff61b0e195 100644 --- a/package.nls.pl.json +++ b/package.nls.pl.json @@ -2,6 +2,7 @@ "extension.displayName": "Roo Code (wcześniej Roo Cline)", "extension.description": "Pełny zespół programistów AI w twoim edytorze.", "command.newTask.title": "Nowe Zadanie", + "command.explainCode.title": "Wyjaśnij Kod", "command.fixCode.title": "Napraw Kod", "command.addToContext.title": "Dodaj do Kontekstu", "command.openInNewTab.title": "Otwórz w Nowej Karcie", diff --git a/package.nls.pt-BR.json b/package.nls.pt-BR.json index 2d155ae73c8..33feb613c65 100644 --- a/package.nls.pt-BR.json +++ b/package.nls.pt-BR.json @@ -2,6 +2,7 @@ "extension.displayName": "Roo Code (anteriormente Roo Cline)", "extension.description": "Uma equipe completa de desenvolvimento de agentes de IA no seu editor.", "command.newTask.title": "Nova Tarefa", + "command.explainCode.title": "Explicar Código", "command.fixCode.title": "Corrigir Código", "command.addToContext.title": "Adicionar ao Contexto", "command.openInNewTab.title": "Abrir em Nova Aba", diff --git a/package.nls.ru.json b/package.nls.ru.json index f1d7b85c9f3..df9bafe12c5 100644 --- a/package.nls.ru.json +++ b/package.nls.ru.json @@ -12,6 +12,7 @@ "command.settings.title": "Настройки", "command.documentation.title": "Документация", "command.openInNewTab.title": "Открыть в новой вкладке", + "command.explainCode.title": "Объяснить код", "command.fixCode.title": "Исправить код", "command.addToContext.title": "Добавить в контекст", "command.focusInput.title": "Фокус на поле ввода", diff --git a/package.nls.tr.json b/package.nls.tr.json index 2210f35c641..4d13fa21626 100644 --- a/package.nls.tr.json +++ b/package.nls.tr.json @@ -2,6 +2,7 @@ "extension.displayName": "Roo Code (önceden Roo Cline)", "extension.description": "Düzenleyicinde tam bir AI ajanları geliştirme ekibi.", "command.newTask.title": "Yeni Görev", + "command.explainCode.title": "Kodu Açıkla", "command.fixCode.title": "Kodu Düzelt", "command.addToContext.title": "Bağlama Ekle", "command.openInNewTab.title": "Yeni Sekmede Aç", diff --git a/package.nls.vi.json b/package.nls.vi.json index c09a4b2f1f4..54c6186f92d 100644 --- a/package.nls.vi.json +++ b/package.nls.vi.json @@ -2,6 +2,7 @@ "extension.displayName": "Roo Code (trước đây là Roo Cline)", "extension.description": "Một đội ngũ phát triển các tác nhân AI hoàn chỉnh trong trình soạn thảo của bạn.", "command.newTask.title": "Tác Vụ Mới", + "command.explainCode.title": "Giải Thích Mã", "command.fixCode.title": "Sửa Mã", "command.addToContext.title": "Thêm vào Ngữ Cảnh", "command.openInNewTab.title": "Mở trong Tab Mới", diff --git a/package.nls.zh-CN.json b/package.nls.zh-CN.json index 4bac1d10047..e00be2b3668 100644 --- a/package.nls.zh-CN.json +++ b/package.nls.zh-CN.json @@ -2,6 +2,7 @@ "extension.displayName": "Roo Code (原名 Roo Cline)", "extension.description": "在你的编辑器中提供完整的 AI 代理开发团队。", "command.newTask.title": "新建任务", + "command.explainCode.title": "解释代码", "command.fixCode.title": "修复代码", "command.addToContext.title": "添加到上下文", "command.openInNewTab.title": "在新标签页中打开", diff --git a/package.nls.zh-TW.json b/package.nls.zh-TW.json index 4b16db9efe7..a4ff95b8807 100644 --- a/package.nls.zh-TW.json +++ b/package.nls.zh-TW.json @@ -2,6 +2,7 @@ "extension.displayName": "Roo Code (原名 Roo Cline)", "extension.description": "在你的編輯器中提供完整的 AI 代理開發團隊。", "command.newTask.title": "新建任務", + "command.explainCode.title": "解釋程式碼", "command.fixCode.title": "修復程式碼", "command.addToContext.title": "添加到上下文", "command.openInNewTab.title": "在新分頁中開啟", diff --git a/src/core/CodeActionProvider.ts b/src/core/CodeActionProvider.ts index 4dca1c7902c..2f558297a25 100644 --- a/src/core/CodeActionProvider.ts +++ b/src/core/CodeActionProvider.ts @@ -2,15 +2,17 @@ import * as vscode from "vscode" import { EditorUtils } from "./EditorUtils" -type CodeActionName = "FIX" | "ADD_TO_CONTEXT" | "NEW_TASK" +type CodeActionName = "EXPLAIN" | "FIX" | "ADD_TO_CONTEXT" | "NEW_TASK" export const ACTION_NAMES: Record = { + EXPLAIN: "Explain with Roo Code", FIX: "Fix with Roo Code", ADD_TO_CONTEXT: "Add to Roo Code", NEW_TASK: "New Roo Code Task", } as const export const COMMAND_IDS: Record = { + EXPLAIN: "roo-cline.explainCode", FIX: "roo-cline.fixCode", ADD_TO_CONTEXT: "roo-cline.addToContext", NEW_TASK: "roo-cline.newTask", @@ -57,6 +59,15 @@ export class CodeActionProvider implements vscode.CodeActionProvider { ), ) + actions.push( + this.createAction(ACTION_NAMES.EXPLAIN, vscode.CodeActionKind.QuickFix, COMMAND_IDS.EXPLAIN, [ + filePath, + effectiveRange.text, + effectiveRange.range.start.line + 1, + effectiveRange.range.end.line + 1, + ]), + ) + if (context.diagnostics.length > 0) { const relevantDiagnostics = context.diagnostics.filter((d) => EditorUtils.hasIntersectingRange(effectiveRange.range, d.range), From cbb912dd40be97500ae7ce6058cef7585308932a Mon Sep 17 00:00:00 2001 From: cte Date: Tue, 29 Apr 2025 00:03:54 -0700 Subject: [PATCH 5/7] Bring "Improve Code" back --- e2e/src/suite/extension.test.ts | 1 + package.json | 9 +++++++++ package.nls.ca.json | 1 + package.nls.de.json | 1 + package.nls.es.json | 1 + package.nls.fr.json | 1 + package.nls.hi.json | 1 + package.nls.it.json | 1 + package.nls.ja.json | 1 + package.nls.json | 1 + package.nls.ko.json | 1 + package.nls.pl.json | 1 + package.nls.pt-BR.json | 1 + package.nls.ru.json | 1 + package.nls.tr.json | 1 + package.nls.vi.json | 1 + package.nls.zh-CN.json | 1 + package.nls.zh-TW.json | 1 + src/activate/registerCodeActions.ts | 15 ++++++++------- src/core/CodeActionProvider.ts | 10 ++++++++-- 20 files changed, 42 insertions(+), 9 deletions(-) diff --git a/e2e/src/suite/extension.test.ts b/e2e/src/suite/extension.test.ts index f8ce320df55..1f448246102 100644 --- a/e2e/src/suite/extension.test.ts +++ b/e2e/src/suite/extension.test.ts @@ -12,6 +12,7 @@ suite("Roo Code Extension", () => { "roo-cline.openInNewTab", "roo-cline.explainCode", "roo-cline.fixCode", + "roo-cline.improveCode", ] const commands = await vscode.commands.getCommands(true) diff --git a/package.json b/package.json index 861b35df94e..7fbecd4ffc6 100644 --- a/package.json +++ b/package.json @@ -130,6 +130,11 @@ "title": "%command.fixCode.title%", "category": "%configuration.title%" }, + { + "command": "roo-cline.improveCode", + "title": "%command.improveCode.title%", + "category": "%configuration.title%" + }, { "command": "roo-cline.addToContext", "title": "%command.addToContext.title%", @@ -186,6 +191,10 @@ { "command": "roo-cline.explainCode", "group": "1_actions@2" + }, + { + "command": "roo-cline.improveCode", + "group": "1_actions@3" } ], "terminal/context": [ diff --git a/package.nls.ca.json b/package.nls.ca.json index 293a2ac0b59..91745efabf6 100644 --- a/package.nls.ca.json +++ b/package.nls.ca.json @@ -4,6 +4,7 @@ "command.newTask.title": "Nova Tasca", "command.explainCode.title": "Explicar Codi", "command.fixCode.title": "Corregir Codi", + "command.improveCode.title": "Millorar Codi", "command.addToContext.title": "Afegir al Context", "command.openInNewTab.title": "Obrir en una Nova Pestanya", "command.focusInput.title": "Enfocar Camp d'Entrada", diff --git a/package.nls.de.json b/package.nls.de.json index a35fa64dff6..83c358a4b52 100644 --- a/package.nls.de.json +++ b/package.nls.de.json @@ -4,6 +4,7 @@ "command.newTask.title": "Neue Aufgabe", "command.explainCode.title": "Code Erklären", "command.fixCode.title": "Code Reparieren", + "command.improveCode.title": "Code Verbessern", "command.addToContext.title": "Zum Kontext Hinzufügen", "command.openInNewTab.title": "In Neuem Tab Öffnen", "command.focusInput.title": "Eingabefeld Fokussieren", diff --git a/package.nls.es.json b/package.nls.es.json index e0fd9ba09fc..a116a762a92 100644 --- a/package.nls.es.json +++ b/package.nls.es.json @@ -4,6 +4,7 @@ "command.newTask.title": "Nueva Tarea", "command.explainCode.title": "Explicar Código", "command.fixCode.title": "Corregir Código", + "command.improveCode.title": "Mejorar Código", "command.addToContext.title": "Añadir al Contexto", "command.openInNewTab.title": "Abrir en Nueva Pestaña", "command.focusInput.title": "Enfocar Campo de Entrada", diff --git a/package.nls.fr.json b/package.nls.fr.json index b1f0aad1c9b..55b56bf33c8 100644 --- a/package.nls.fr.json +++ b/package.nls.fr.json @@ -4,6 +4,7 @@ "command.newTask.title": "Nouvelle Tâche", "command.explainCode.title": "Expliquer le Code", "command.fixCode.title": "Corriger le Code", + "command.improveCode.title": "Améliorer le Code", "command.addToContext.title": "Ajouter au Contexte", "command.openInNewTab.title": "Ouvrir dans un Nouvel Onglet", "command.focusInput.title": "Focus sur le Champ de Saisie", diff --git a/package.nls.hi.json b/package.nls.hi.json index 490d7880168..fdef15fff80 100644 --- a/package.nls.hi.json +++ b/package.nls.hi.json @@ -4,6 +4,7 @@ "command.newTask.title": "नया कार्य", "command.explainCode.title": "कोड समझाएं", "command.fixCode.title": "कोड ठीक करें", + "command.improveCode.title": "कोड सुधारें", "command.addToContext.title": "संदर्भ में जोड़ें", "command.openInNewTab.title": "नए टैब में खोलें", "command.focusInput.title": "इनपुट फ़ील्ड पर फोकस करें", diff --git a/package.nls.it.json b/package.nls.it.json index 86ca00b21dd..aa238eaae79 100644 --- a/package.nls.it.json +++ b/package.nls.it.json @@ -4,6 +4,7 @@ "command.newTask.title": "Nuovo Task", "command.explainCode.title": "Spiega Codice", "command.fixCode.title": "Correggi Codice", + "command.improveCode.title": "Migliora Codice", "command.addToContext.title": "Aggiungi al Contesto", "command.openInNewTab.title": "Apri in Nuova Scheda", "command.focusInput.title": "Focalizza Campo di Input", diff --git a/package.nls.ja.json b/package.nls.ja.json index e15f81ed535..cec6408ffd4 100644 --- a/package.nls.ja.json +++ b/package.nls.ja.json @@ -14,6 +14,7 @@ "command.openInNewTab.title": "新しいタブで開く", "command.explainCode.title": "コードの説明", "command.fixCode.title": "コードの修正", + "command.improveCode.title": "コードの改善", "command.addToContext.title": "コンテキストに追加", "command.focusInput.title": "入力フィールドにフォーカス", "command.setCustomStoragePath.title": "カスタムストレージパスの設定", diff --git a/package.nls.json b/package.nls.json index 452fc0a9515..4bcb49723a8 100644 --- a/package.nls.json +++ b/package.nls.json @@ -14,6 +14,7 @@ "command.openInNewTab.title": "Open In New Tab", "command.explainCode.title": "Explain Code", "command.fixCode.title": "Fix Code", + "command.improveCode.title": "Improve Code", "command.addToContext.title": "Add To Context", "command.focusInput.title": "Focus Input Field", "command.setCustomStoragePath.title": "Set Custom Storage Path", diff --git a/package.nls.ko.json b/package.nls.ko.json index 35cba9a2dc0..54d54a6709a 100644 --- a/package.nls.ko.json +++ b/package.nls.ko.json @@ -4,6 +4,7 @@ "command.newTask.title": "새 작업", "command.explainCode.title": "코드 설명", "command.fixCode.title": "코드 수정", + "command.improveCode.title": "코드 개선", "command.addToContext.title": "컨텍스트에 추가", "command.openInNewTab.title": "새 탭에서 열기", "command.focusInput.title": "입력 필드 포커스", diff --git a/package.nls.pl.json b/package.nls.pl.json index 5ff61b0e195..c22b4e99e62 100644 --- a/package.nls.pl.json +++ b/package.nls.pl.json @@ -4,6 +4,7 @@ "command.newTask.title": "Nowe Zadanie", "command.explainCode.title": "Wyjaśnij Kod", "command.fixCode.title": "Napraw Kod", + "command.improveCode.title": "Ulepsz Kod", "command.addToContext.title": "Dodaj do Kontekstu", "command.openInNewTab.title": "Otwórz w Nowej Karcie", "command.focusInput.title": "Fokus na Pole Wprowadzania", diff --git a/package.nls.pt-BR.json b/package.nls.pt-BR.json index 33feb613c65..0b93b1fbfea 100644 --- a/package.nls.pt-BR.json +++ b/package.nls.pt-BR.json @@ -4,6 +4,7 @@ "command.newTask.title": "Nova Tarefa", "command.explainCode.title": "Explicar Código", "command.fixCode.title": "Corrigir Código", + "command.improveCode.title": "Melhorar Código", "command.addToContext.title": "Adicionar ao Contexto", "command.openInNewTab.title": "Abrir em Nova Aba", "command.focusInput.title": "Focar Campo de Entrada", diff --git a/package.nls.ru.json b/package.nls.ru.json index df9bafe12c5..ec122061a3a 100644 --- a/package.nls.ru.json +++ b/package.nls.ru.json @@ -14,6 +14,7 @@ "command.openInNewTab.title": "Открыть в новой вкладке", "command.explainCode.title": "Объяснить код", "command.fixCode.title": "Исправить код", + "command.improveCode.title": "Улучшить код", "command.addToContext.title": "Добавить в контекст", "command.focusInput.title": "Фокус на поле ввода", "command.setCustomStoragePath.title": "Указать путь хранения", diff --git a/package.nls.tr.json b/package.nls.tr.json index 4d13fa21626..c980e90b91e 100644 --- a/package.nls.tr.json +++ b/package.nls.tr.json @@ -4,6 +4,7 @@ "command.newTask.title": "Yeni Görev", "command.explainCode.title": "Kodu Açıkla", "command.fixCode.title": "Kodu Düzelt", + "command.improveCode.title": "Kodu İyileştir", "command.addToContext.title": "Bağlama Ekle", "command.openInNewTab.title": "Yeni Sekmede Aç", "command.focusInput.title": "Giriş Alanına Odaklan", diff --git a/package.nls.vi.json b/package.nls.vi.json index 54c6186f92d..34788bbef72 100644 --- a/package.nls.vi.json +++ b/package.nls.vi.json @@ -4,6 +4,7 @@ "command.newTask.title": "Tác Vụ Mới", "command.explainCode.title": "Giải Thích Mã", "command.fixCode.title": "Sửa Mã", + "command.improveCode.title": "Cải Thiện Mã", "command.addToContext.title": "Thêm vào Ngữ Cảnh", "command.openInNewTab.title": "Mở trong Tab Mới", "command.focusInput.title": "Tập Trung vào Trường Nhập", diff --git a/package.nls.zh-CN.json b/package.nls.zh-CN.json index e00be2b3668..ac64f36bffa 100644 --- a/package.nls.zh-CN.json +++ b/package.nls.zh-CN.json @@ -4,6 +4,7 @@ "command.newTask.title": "新建任务", "command.explainCode.title": "解释代码", "command.fixCode.title": "修复代码", + "command.improveCode.title": "改进代码", "command.addToContext.title": "添加到上下文", "command.openInNewTab.title": "在新标签页中打开", "command.focusInput.title": "聚焦输入框", diff --git a/package.nls.zh-TW.json b/package.nls.zh-TW.json index a4ff95b8807..e9349416f2d 100644 --- a/package.nls.zh-TW.json +++ b/package.nls.zh-TW.json @@ -4,6 +4,7 @@ "command.newTask.title": "新建任務", "command.explainCode.title": "解釋程式碼", "command.fixCode.title": "修復程式碼", + "command.improveCode.title": "改進程式碼", "command.addToContext.title": "添加到上下文", "command.openInNewTab.title": "在新分頁中開啟", "command.focusInput.title": "聚焦輸入框", diff --git a/src/activate/registerCodeActions.ts b/src/activate/registerCodeActions.ts index d2f0eb1e83d..056afe11cb9 100644 --- a/src/activate/registerCodeActions.ts +++ b/src/activate/registerCodeActions.ts @@ -1,19 +1,16 @@ import * as vscode from "vscode" -import { ACTION_NAMES, COMMAND_IDS } from "../core/CodeActionProvider" +import { type CodeActionName, type CodeActionId, COMMAND_IDS } from "../core/CodeActionProvider" import { EditorUtils } from "../core/EditorUtils" import { ClineProvider } from "../core/webview/ClineProvider" export const registerCodeActions = (context: vscode.ExtensionContext) => { + registerCodeAction(context, COMMAND_IDS.EXPLAIN, "EXPLAIN") registerCodeAction(context, COMMAND_IDS.FIX, "FIX") registerCodeAction(context, COMMAND_IDS.ADD_TO_CONTEXT, "ADD_TO_CONTEXT") } -const registerCodeAction = ( - context: vscode.ExtensionContext, - command: string, - promptType: keyof typeof ACTION_NAMES, -) => { +const registerCodeAction = (context: vscode.ExtensionContext, command: CodeActionId, promptType: CodeActionName) => { let userInput: string | undefined context.subscriptions.push( @@ -31,7 +28,11 @@ const registerCodeAction = ( } else { // Called directly from command palette. const context = EditorUtils.getEditorContext() - if (!context) return + + if (!context) { + return + } + ;({ filePath, selectedText, startLine, endLine, diagnostics } = context) } diff --git a/src/core/CodeActionProvider.ts b/src/core/CodeActionProvider.ts index 2f558297a25..b64216c329e 100644 --- a/src/core/CodeActionProvider.ts +++ b/src/core/CodeActionProvider.ts @@ -2,7 +2,13 @@ import * as vscode from "vscode" import { EditorUtils } from "./EditorUtils" -type CodeActionName = "EXPLAIN" | "FIX" | "ADD_TO_CONTEXT" | "NEW_TASK" +export type CodeActionName = "EXPLAIN" | "FIX" | "ADD_TO_CONTEXT" | "NEW_TASK" + +export type CodeActionId = + | "roo-cline.explainCode" + | "roo-cline.fixCode" + | "roo-cline.addToContext" + | "roo-cline.newTask" export const ACTION_NAMES: Record = { EXPLAIN: "Explain with Roo Code", @@ -11,7 +17,7 @@ export const ACTION_NAMES: Record = { NEW_TASK: "New Roo Code Task", } as const -export const COMMAND_IDS: Record = { +export const COMMAND_IDS: Record = { EXPLAIN: "roo-cline.explainCode", FIX: "roo-cline.fixCode", ADD_TO_CONTEXT: "roo-cline.addToContext", From 611b994c5df8591a110b16a9a044d8e806d2f092 Mon Sep 17 00:00:00 2001 From: cte Date: Tue, 29 Apr 2025 00:11:44 -0700 Subject: [PATCH 6/7] Add back "Improve" --- src/activate/registerCodeActions.ts | 1 + src/core/CodeActionProvider.ts | 45 +++++++++++++------ src/core/__tests__/CodeActionProvider.test.ts | 12 ++--- src/core/webview/ClineProvider.ts | 5 ++- 4 files changed, 42 insertions(+), 21 deletions(-) diff --git a/src/activate/registerCodeActions.ts b/src/activate/registerCodeActions.ts index 056afe11cb9..b1c15f19e43 100644 --- a/src/activate/registerCodeActions.ts +++ b/src/activate/registerCodeActions.ts @@ -7,6 +7,7 @@ import { ClineProvider } from "../core/webview/ClineProvider" export const registerCodeActions = (context: vscode.ExtensionContext) => { registerCodeAction(context, COMMAND_IDS.EXPLAIN, "EXPLAIN") registerCodeAction(context, COMMAND_IDS.FIX, "FIX") + registerCodeAction(context, COMMAND_IDS.IMPROVE, "IMPROVE") registerCodeAction(context, COMMAND_IDS.ADD_TO_CONTEXT, "ADD_TO_CONTEXT") } diff --git a/src/core/CodeActionProvider.ts b/src/core/CodeActionProvider.ts index b64216c329e..964542ba5d2 100644 --- a/src/core/CodeActionProvider.ts +++ b/src/core/CodeActionProvider.ts @@ -2,17 +2,19 @@ import * as vscode from "vscode" import { EditorUtils } from "./EditorUtils" -export type CodeActionName = "EXPLAIN" | "FIX" | "ADD_TO_CONTEXT" | "NEW_TASK" +export type CodeActionName = "EXPLAIN" | "FIX" | "IMPROVE" | "ADD_TO_CONTEXT" | "NEW_TASK" export type CodeActionId = | "roo-cline.explainCode" | "roo-cline.fixCode" + | "roo-cline.improveCode" | "roo-cline.addToContext" | "roo-cline.newTask" -export const ACTION_NAMES: Record = { +export const ACTION_TITLES: Record = { EXPLAIN: "Explain with Roo Code", FIX: "Fix with Roo Code", + IMPROVE: "Improve with Roo Code", ADD_TO_CONTEXT: "Add to Roo Code", NEW_TASK: "New Roo Code Task", } as const @@ -20,6 +22,7 @@ export const ACTION_NAMES: Record = { export const COMMAND_IDS: Record = { EXPLAIN: "roo-cline.explainCode", FIX: "roo-cline.fixCode", + IMPROVE: "roo-cline.improveCode", ADD_TO_CONTEXT: "roo-cline.addToContext", NEW_TASK: "roo-cline.newTask", } as const @@ -30,7 +33,12 @@ export class CodeActionProvider implements vscode.CodeActionProvider { vscode.CodeActionKind.RefactorRewrite, ] - private createAction(title: string, kind: vscode.CodeActionKind, command: string, args: any[]): vscode.CodeAction { + private createAction( + title: string, + kind: vscode.CodeActionKind, + command: CodeActionId, + args: any[], + ): vscode.CodeAction { const action = new vscode.CodeAction(title, kind) action.command = { command, title, arguments: args } return action @@ -53,7 +61,7 @@ export class CodeActionProvider implements vscode.CodeActionProvider { actions.push( this.createAction( - ACTION_NAMES.ADD_TO_CONTEXT, + ACTION_TITLES.ADD_TO_CONTEXT, vscode.CodeActionKind.QuickFix, COMMAND_IDS.ADD_TO_CONTEXT, [ @@ -65,15 +73,6 @@ export class CodeActionProvider implements vscode.CodeActionProvider { ), ) - actions.push( - this.createAction(ACTION_NAMES.EXPLAIN, vscode.CodeActionKind.QuickFix, COMMAND_IDS.EXPLAIN, [ - filePath, - effectiveRange.text, - effectiveRange.range.start.line + 1, - effectiveRange.range.end.line + 1, - ]), - ) - if (context.diagnostics.length > 0) { const relevantDiagnostics = context.diagnostics.filter((d) => EditorUtils.hasIntersectingRange(effectiveRange.range, d.range), @@ -81,7 +80,7 @@ export class CodeActionProvider implements vscode.CodeActionProvider { if (relevantDiagnostics.length > 0) { actions.push( - this.createAction(ACTION_NAMES.FIX, vscode.CodeActionKind.QuickFix, COMMAND_IDS.FIX, [ + this.createAction(ACTION_TITLES.FIX, vscode.CodeActionKind.QuickFix, COMMAND_IDS.FIX, [ filePath, effectiveRange.text, effectiveRange.range.start.line + 1, @@ -90,6 +89,24 @@ export class CodeActionProvider implements vscode.CodeActionProvider { ]), ) } + } else { + actions.push( + this.createAction(ACTION_TITLES.EXPLAIN, vscode.CodeActionKind.QuickFix, COMMAND_IDS.EXPLAIN, [ + filePath, + effectiveRange.text, + effectiveRange.range.start.line + 1, + effectiveRange.range.end.line + 1, + ]), + ) + + actions.push( + this.createAction(ACTION_TITLES.IMPROVE, vscode.CodeActionKind.QuickFix, COMMAND_IDS.IMPROVE, [ + filePath, + effectiveRange.text, + effectiveRange.range.start.line + 1, + effectiveRange.range.end.line + 1, + ]), + ) } return actions diff --git a/src/core/__tests__/CodeActionProvider.test.ts b/src/core/__tests__/CodeActionProvider.test.ts index fa8db93af41..1d6b84f09d6 100644 --- a/src/core/__tests__/CodeActionProvider.test.ts +++ b/src/core/__tests__/CodeActionProvider.test.ts @@ -4,7 +4,7 @@ import * as vscode from "vscode" import { EditorUtils } from "../EditorUtils" -import { CodeActionProvider, ACTION_NAMES } from "../CodeActionProvider" +import { CodeActionProvider, ACTION_TITLES } from "../CodeActionProvider" // Mock VSCode API jest.mock("vscode", () => ({ @@ -78,8 +78,10 @@ describe("CodeActionProvider", () => { it("should provide explain, improve, fix logic, and add to context actions by default", () => { const actions = provider.provideCodeActions(mockDocument, mockRange, mockContext) - expect(actions).toHaveLength(1) - expect((actions as any)[0].title).toBe(ACTION_NAMES.ADD_TO_CONTEXT) + expect(actions).toHaveLength(3) + expect((actions as any)[0].title).toBe(ACTION_TITLES.ADD_TO_CONTEXT) + expect((actions as any)[1].title).toBe(ACTION_TITLES.EXPLAIN) + expect((actions as any)[2].title).toBe(ACTION_TITLES.IMPROVE) }) it("should provide fix action instead of fix logic when diagnostics exist", () => { @@ -90,8 +92,8 @@ describe("CodeActionProvider", () => { const actions = provider.provideCodeActions(mockDocument, mockRange, mockContext) expect(actions).toHaveLength(2) - expect((actions as any).some((a: any) => a.title === `${ACTION_NAMES.FIX}`)).toBe(true) - expect((actions as any).some((a: any) => a.title === `${ACTION_NAMES.ADD_TO_CONTEXT}`)).toBe(true) + expect((actions as any).some((a: any) => a.title === `${ACTION_TITLES.FIX}`)).toBe(true) + expect((actions as any).some((a: any) => a.title === `${ACTION_TITLES.ADD_TO_CONTEXT}`)).toBe(true) }) it("should return empty array when no effective range", () => { diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index f6bb3afb3de..1211c207ef9 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -41,7 +41,7 @@ import { ContextProxy } from "../config/ContextProxy" import { ProviderSettingsManager } from "../config/ProviderSettingsManager" import { CustomModesManager } from "../config/CustomModesManager" import { buildApiHandler } from "../../api" -import { ACTION_NAMES } from "../CodeActionProvider" +import { CodeActionName } from "../CodeActionProvider" import { Cline, ClineOptions } from "../Cline" import { getNonce } from "./getNonce" import { getUri } from "./getUri" @@ -262,7 +262,7 @@ export class ClineProvider extends EventEmitter implements public static async handleCodeAction( command: string, - promptType: keyof typeof ACTION_NAMES, + promptType: CodeActionName, params: Record, ): Promise { // Capture telemetry for code action usage @@ -276,6 +276,7 @@ export class ClineProvider extends EventEmitter implements const { customSupportPrompts } = await visibleProvider.getState() + // TODO: Improve type safety for promptType. const prompt = supportPrompt.create(promptType, params, customSupportPrompts) if (command.endsWith("addToContext")) { From 1454e35e3508445e09d5a933224940cbcafce9f3 Mon Sep 17 00:00:00 2001 From: cte Date: Tue, 29 Apr 2025 00:17:26 -0700 Subject: [PATCH 7/7] This is too flakey for now --- e2e/src/suite/subtasks.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/src/suite/subtasks.test.ts b/e2e/src/suite/subtasks.test.ts index da64cfdb2cc..c73e2c4ce98 100644 --- a/e2e/src/suite/subtasks.test.ts +++ b/e2e/src/suite/subtasks.test.ts @@ -4,7 +4,7 @@ import type { ClineMessage } from "../../../src/exports/roo-code" import { sleep, waitFor, waitUntilCompleted } from "./utils" -suite("Roo Code Subtasks", () => { +suite.skip("Roo Code Subtasks", () => { test("Should handle subtask cancellation and resumption correctly", async () => { const api = globalThis.api