From 36a16ccd435b62c77f05e9d7de8fe7484247e643 Mon Sep 17 00:00:00 2001 From: "bobo.yang" Date: Tue, 12 Dec 2023 16:39:08 +0800 Subject: [PATCH] add code lens --- package.json | 9 ++ src/contributes/commands.ts | 10 ++ src/extension.ts | 6 +- src/handler/chatHandler.ts | 6 + src/panel/codeLens.ts | 157 ++++++++++++++++++++ src/views/components/InputMessage/index.tsx | 3 + 6 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 src/handler/chatHandler.ts create mode 100644 src/panel/codeLens.ts diff --git a/package.json b/package.json index 7cb9134..ba6a9bd 100644 --- a/package.json +++ b/package.json @@ -667,6 +667,11 @@ "command": "DevChat.InstallCommandPython", "title": "Install Python for Commands", "category": "DevChat" + }, + { + "command": "DevChat.Chat", + "title": "Chat with DevChat", + "category": "DevChat" } ], "menus": { @@ -749,6 +754,10 @@ { "command": "devchat.askForFile_chinese", "when": "false" + }, + { + "command": "DevChat.Chat", + "when": "false" } ], "explorer/context": [ diff --git a/src/contributes/commands.ts b/src/contributes/commands.ts index 8d9d815..f236127 100644 --- a/src/contributes/commands.ts +++ b/src/contributes/commands.ts @@ -18,6 +18,7 @@ import { sendCommandListByDevChatRun, updateChatModels } from '../handler/workfl import DevChat from "../toolwrapper/devchat"; import { createEnvByConda, createEnvByMamba } from '../util/python_installer/app_install'; import { installRequirements } from '../util/python_installer/package_install'; +import { chatWithDevChat } from '../handler/chatHandler'; function registerOpenChatPanelCommand(context: vscode.ExtensionContext) { @@ -340,6 +341,15 @@ export function registerInstallCommandsPython(context: vscode.ExtensionContext) context.subscriptions.push(disposable); } +export function registerDevChatChatCommand(context: vscode.ExtensionContext) { + let disposable = vscode.commands.registerCommand('DevChat.Chat', async (message: string) => { + ensureChatPanel(context); + chatWithDevChat(ExtensionContextHolder.provider?.view()!, message); + }); + + context.subscriptions.push(disposable); +} + export { registerOpenChatPanelCommand, registerAddContextCommand, diff --git a/src/extension.ts b/src/extension.ts index 9ce766e..967cdfd 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -16,7 +16,8 @@ import { regPythonPathCommand, registerInstallCommandsCommand, registerUpdateChatModelsCommand, - registerInstallCommandsPython + registerInstallCommandsPython, + registerDevChatChatCommand } from './contributes/commands'; import { regLanguageContext } from './contributes/context'; import { regDevChatView, regTopicView } from './contributes/views'; @@ -29,6 +30,7 @@ import { UiUtilWrapper } from './util/uiUtil'; import { UiUtilVscode } from './util/uiUtil_vscode'; import { ApiKeyManager } from './util/apiKey'; import { startRpcServer } from './ide_services/services'; +import { registerCodeLensProvider } from './panel/codeLens'; async function isProviderHasSetted() { try { @@ -216,6 +218,7 @@ async function activate(context: vscode.ExtensionContext) { await configUpdateTo1115(); regLanguageContext(); + registerCodeLensProvider(context); regDevChatView(context); regTopicView(context); @@ -241,6 +244,7 @@ async function activate(context: vscode.ExtensionContext) { regApplyDiffResultCommand(context); regPythonPathCommand(context); + registerDevChatChatCommand(context); startRpcServer(); } diff --git a/src/handler/chatHandler.ts b/src/handler/chatHandler.ts new file mode 100644 index 0000000..936699f --- /dev/null +++ b/src/handler/chatHandler.ts @@ -0,0 +1,6 @@ +import { MessageHandler } from './messageHandler'; + + +export async function chatWithDevChat(panel, message: string) { + MessageHandler.sendMessage(panel!, { command: 'chatWithDevChat', 'message': message }); +} diff --git a/src/panel/codeLens.ts b/src/panel/codeLens.ts new file mode 100644 index 0000000..409b554 --- /dev/null +++ b/src/panel/codeLens.ts @@ -0,0 +1,157 @@ +import * as vscode from 'vscode'; +import * as fs from 'fs'; +import * as path from 'path'; + +interface FunctionDefinition { + name: string; + containerName: string | null; + range: vscode.Range; +} + +type CodeLensRegistration = { + elementType: string; + objectName: string; + promptGenerator: string; +}; + +export class CodeLensManager { + private static instance: CodeLensManager; + private registrations: CodeLensRegistration[] = []; + private configFilePath: string; + + private constructor() { + this.configFilePath = path.join(process.env.HOME || process.env.USERPROFILE || '.', '.chat/ideconfig.json'); + this.loadConfig(); + } + + public static getInstance(): CodeLensManager { + if (!CodeLensManager.instance) { + CodeLensManager.instance = new CodeLensManager(); + } + return CodeLensManager.instance; + } + + private loadConfig(): void { + if (!fs.existsSync(this.configFilePath)) { + this.initializeConfig(); + } else { + const data = fs.readFileSync(this.configFilePath, 'utf8'); + this.registrations = JSON.parse(data); + } + } + + private initializeConfig(): void { + this.registrations = [ + // { + // elementType: 'function', + // objectName: 'generate unit tests', + // promptGenerator: '/test generate unit tests for {__filename__} {__functionName__}' + // } + ]; + this.saveConfig(); + } + + private saveConfig(): void { + const configDir = path.dirname(this.configFilePath); + if (!fs.existsSync(configDir)) { + fs.mkdirSync(configDir, { recursive: true }); + } + fs.writeFileSync(this.configFilePath, JSON.stringify(this.registrations, null, 2), 'utf8'); + } + + public getRegistrations(): CodeLensRegistration[] { + return this.registrations; + } +} + + +async function getFunctionDefinitions(document: vscode.TextDocument): Promise { + const symbols: vscode.DocumentSymbol[] | undefined = await vscode.commands.executeCommand( + 'vscode.executeDocumentSymbolProvider', + document.uri + ); + + if (!symbols) { + return []; + } + + function extractFunctions(symbol: vscode.DocumentSymbol, containerName: string | null): FunctionDefinition[] { + let functions: FunctionDefinition[] = []; + if (symbol.kind === vscode.SymbolKind.Function || symbol.kind === vscode.SymbolKind.Method) { + functions.push({ + name: symbol.name, + containerName: containerName, + range: symbol.range + }); + } else { + if (symbol.children && symbol.children.length > 0) { + symbol.children.forEach(child => { + functions = functions.concat(extractFunctions(child, symbol.name)); + }); + } + } + + return functions; + } + + let functionSymbols: FunctionDefinition[] = []; + symbols.forEach(symbol => { + functionSymbols = functionSymbols.concat(extractFunctions(symbol, null)); + }); + + return functionSymbols; +} + + + +class FunctionTestCodeLensProvider implements vscode.CodeLensProvider { + // The provideCodeLenses method should have the correct signature + async provideCodeLenses(document: vscode.TextDocument, token: vscode.CancellationToken): Promise { + const lenses: vscode.CodeLens[] = []; + const functionDefinitions = await getFunctionDefinitions(document); + + functionDefinitions.forEach((funcDef) => { + const range = new vscode.Range( + new vscode.Position(funcDef.range.start.line, funcDef.range.start.character), + new vscode.Position(funcDef.range.end.line, funcDef.range.end.character) + ); + + const codelenRegisters: CodeLensRegistration[] = CodeLensManager.getInstance().getRegistrations(); + // Iterate over codelenRegisters with 'of' instead of 'in' + for (const codelenRegister of codelenRegisters) { + if (codelenRegister.elementType !== "function") { + continue; + } + + // Read range content in document + const functionCode = document.getText(range); + + // Fix the string replacement syntax and closing parentheses + const prompt = codelenRegister.promptGenerator + .replace('{__filename__}', document.uri.fsPath) + .replace('{__functionName__}', funcDef.name) + .replace('{__functionRange__}', `[${range.start.line}, ${range.end.line}]`) + .replace('{__functionCode__}', functionCode); // Fixed syntax + + const lens = new vscode.CodeLens(range, { + title: codelenRegister.objectName, + command: "DevChat.Chat", + // arguments: [document.uri.fsPath, range, funcDef.name] // Commented out as it's not used + arguments: [prompt] + }); + + lenses.push(lens); + } + }); + + return lenses; + } +} + + +export function registerCodeLensProvider(context) { + const provider = new FunctionTestCodeLensProvider(); + const disposable = vscode.languages.registerCodeLensProvider("*", provider); + + context.subscriptions.push(disposable); +} diff --git a/src/views/components/InputMessage/index.tsx b/src/views/components/InputMessage/index.tsx index 655af57..efdd2bb 100644 --- a/src/views/components/InputMessage/index.tsx +++ b/src/views/components/InputMessage/index.tsx @@ -137,6 +137,9 @@ const InputMessage = observer((props: any) => { messageUtil.registerHandler('regCommandList', (message: { result: object[]}) => { input.updateCommands(message.result); }); + messageUtil.registerHandler('chatWithDevChat', (message: {command: string, message: string}) => { + chat.commonMessage(message.message, []); + }); messageUtil.registerHandler('appendContext', (message: { command: string; context: string }) => { // context is a temp file path const match = /\|([^]+?)\]/.exec(message.context);