Merge pull request #595 from devchat-ai/shortcut_code_completion

Update packages, add features, and improve logging

Author: yangbobo2021

gui

@@ -2,7 +2,7 @@
   "name": "devchat",
   "displayName": "${ASSISTANT_NAME_ZH}",
   "description": "Write prompts, not code",
-  "version": "0.1.74",
+  "version": "0.1.84",
   "icon": "assets/devchat.png",
   "publisher": "${PUBLISHER}",
   "engines": {
@@ -91,6 +91,14 @@
       ]
     },
     "commands": [
+      {
+        "command": "devchat.triggerCodeComplete",
+        "title": "Trigger Code Completion"
+      },
+      {
+        "command": "devchat.triggerCodeCompleteChinese",
+        "title": "触发代码补全"
+      },
       {
         "command": "devchat.applyDiffResult",
         "title": "Apply Diff",
@@ -189,6 +197,12 @@
         "command": "devchat.openChatPanel",
         "key": "ctrl+shift+/",
         "mac": "cmd+shift+/"
+      },
+      {
+        "command": "devchat.triggerCodeComplete",
+        "key": "ctrl+shift+'",
+        "mac": "cmd+shift+'",
+        "when": "editorTextFocus"
       }
     ],
     "menus": {
@@ -220,6 +234,14 @@
           "command": "devchat.addConext_chinese",
           "when": "false"
         },
+        {
+          "command": "devchat.triggerCodeComplete",
+          "when": "false"
+        },
+        {
+          "command": "devchat.triggerCodeCompleteChinese",
+          "when": "false"
+        },
         {
           "command": "devchat.askForCode_chinese",
           "when": "false"
@@ -290,6 +312,16 @@
         }
       ],
       "editor/context": [
+        {
+          "command": "devchat.triggerCodeComplete",
+          "when": "!isChineseLocale && editorTextFocus",
+          "group": "navigation"
+        },
+        {
+          "command": "devchat.triggerCodeCompleteChinese",
+          "when": "isChineseLocale && editorTextFocus",
+          "group": "navigation"
+        },
         {
           "command": "devchat.askForCode_chinese",
           "when": "isChineseLocale && editorTextFocus && editorHasSelection",

package-lock.json

@@ -16,6 +16,7 @@ export function registerCodeCompleteCallbackCommand(context: vscode.ExtensionCon
     let disposable = vscode.commands.registerCommand(
         "DevChat.codecomplete_callback",
         async (callback: any) => {
+            logger.channel()?.trace(`Trigger codecomplete callback command`);
             callback();
         }
     );
@@ -63,6 +64,7 @@ export class InlineCompletionProvider implements vscode.InlineCompletionItemProv
     private previousCodeComplete: CodeCompleteResult | undefined;
     private previousPrefix: string | undefined;
     private preCompletionItem: vscode.InlineCompletionItem | undefined;
+    private isManualTrigger: boolean = false;
 
     constructor() {
         // TODO
@@ -126,7 +128,17 @@ export class InlineCompletionProvider implements vscode.InlineCompletionItemProv
     //     return true;
     // }
 
+    async triggerCodeComplete(document: vscode.TextDocument, position: vscode.Position) {
+        this.isManualTrigger = true;
+        await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger');
+        // 重置标记，以便下次正常检查配置
+        setTimeout(() => {
+            this.isManualTrigger = false;
+        }, 100);
+    }
+
     async codeComplete(document: vscode.TextDocument, position: vscode.Position, context: vscode.InlineCompletionContext, token: vscode.CancellationToken): Promise<CodeCompleteResultWithMeta | undefined> {
+        logger.channel()?.debug("codeComplete called");
         const startTime = process.hrtime();
         GitDiffWatcher.getInstance().tryRun();
 
@@ -139,6 +151,7 @@ export class InlineCompletionProvider implements vscode.InlineCompletionItemProv
 
         const prompt = await createPrompt(fsPath, fileContent, position.line, position.character, posOffset, this.recentEditors.getEdits());
         if (!prompt) {
+            logger.channel()?.debug("prompt is empty");
             return undefined;
         }
         logger.channel()?.trace("prompt:", prompt);
@@ -203,7 +216,7 @@ export class InlineCompletionProvider implements vscode.InlineCompletionItemProv
         // if (context.selectedCompletionInfo) {
         //     return [];
         // }
-        if (this.devchatConfig.get("complete_enable") !== true) {
+        if (!this.isManualTrigger && this.devchatConfig.get("complete_enable") !== true) {
             return [];
         }
 
@@ -221,7 +234,9 @@ export class InlineCompletionProvider implements vscode.InlineCompletionItemProv
         let response: CodeCompleteResultWithMeta | undefined = undefined;
 
         // 获取当前光标前三行代码
-        const linePrefix = document.getText(new vscode.Range(position.line - 4, 0, position.line, position.character));
+        let preLinesNum = 4;
+        const startLine = Math.max(0, position.line - preLinesNum);
+        const linePrefix = document.getText(new vscode.Range(startLine, 0, position.line, position.character));
 
         // 如果this.previousPrefix + this.previousCodeComplete包含“当前行光标之前内容”，且index为0，那么不需要执行代码补全
         if (this.previousPrefix && this.previousCodeComplete && this.previousCodeComplete.code.length > 0) {

package.json

@@ -3,6 +3,7 @@
  通过LLM模型生成代码补全
 */
 import axios from 'axios';
+import fetch from 'node-fetch';
 
 import { logger } from "../../util/logger";
 import { Chunk } from 'webpack';

src/contributes/codecomplete/codecomplete.ts

@@ -191,6 +191,7 @@ export function registerInstallCommandsCommand(
   let disposable = vscode.commands.registerCommand(
     "DevChat.InstallCommands",
     async () => {
+      logger.channel()?.debug("InstallCommands command triggered.");
       const homePath = process.env.HOME || process.env.USERPROFILE || "";
       const sysDirPath = path.join(homePath, ".chat", "scripts");
       const sysMericoDirPath = path.join(homePath, ".chat", "scripts", "merico");
@@ -202,17 +203,20 @@ export function registerInstallCommandsCommand(
       const dcClient = new DevChatClient();
 
       if (!fs.existsSync(sysMericoDirPath)) {
+        logger.channel()?.debug("Creating directory: " + sysMericoDirPath);
         await copyDirectory(pluginDirPath, sysDirPath);
       }
 
       // Check if ~/.chat/scripts directory exists
-      if (!fs.existsSync(sysDirPath)) {
+      if (!fs.existsSync(sysMericoDirPath)) {
         // Directory does not exist, wait for updateWorkflows to finish
+        logger.channel()?.debug("Update workflows...");
         await dcClient.updateWorkflows();
         await dcClient.updateCustomWorkflows();
         sendCommandListByDevChatRun();
       } else {
         // Directory exists, execute sendCommandListByDevChatRun immediately
+        logger.channel()?.debug("Sending and updating workflows...");
         await sendCommandListByDevChatRun();
 
         // Then asynchronously execute updateWorkflows

src/contributes/codecomplete/llm.ts

@@ -146,6 +146,21 @@ async function activate(context: vscode.ExtensionContext) {
   context.subscriptions.push(vscode.languages.registerInlineCompletionItemProvider(selector, provider));  
   registerCodeCompleteCallbackCommand(context);
 
+  function handleCodeComplete() {
+	const editor = vscode.window.activeTextEditor;
+	if (editor) {
+	  const position = editor.selection.active;
+	  provider.triggerCodeComplete(editor.document, position);
+	}
+  }
+  
+  // command for code completion
+  context.subscriptions.push(
+	// 注册英文命令
+	vscode.commands.registerCommand('devchat.triggerCodeComplete', handleCodeComplete),
+	// 注册中文命令
+	vscode.commands.registerCommand('devchat.triggerCodeCompleteChinese', handleCodeComplete)
+  );
 
   registerOpenChatPanelCommand(context);
   registerAddContextCommand(context);

src/contributes/commands.ts

@@ -1,7 +1,9 @@
+import { logger } from '../../util/logger';
 import * as vscode from 'vscode';
 
 
 export async function updateSlashCommands() {
+    logger.channel()?.debug('Updating slash commands...');
     vscode.commands.executeCommand('DevChat.InstallCommands');
     return true;
 }

src/extension.ts

@@ -3,6 +3,7 @@ import * as vscode from 'vscode';
 import { dependencyCheck } from './statusBarViewBase';
 import { ProgressBar } from '../util/progressBar';
 import { ASSISTANT_NAME_EN } from '../util/constants';
+import { logger } from '../util/logger';
 
 
 export function createStatusBarItem(context: vscode.ExtensionContext): vscode.StatusBarItem {
@@ -50,7 +51,9 @@ export function createStatusBarItem(context: vscode.ExtensionContext): vscode.St
 			// install devchat workflow commands
 			if (!hasInstallCommands) {
 				hasInstallCommands = true;
+				logger.channel()?.debug("Starting local service...");
 				await vscode.commands.executeCommand('DevChat.StartLocalService');
+				logger.channel()?.debug("Installing commands...");
 				await vscode.commands.executeCommand('DevChat.InstallCommands');
 				// vscode.commands.executeCommand('DevChat.InstallCommandPython');
 			}