Edit selected text (#49)

igardev · igardev · web-flow · commit 05fcdd438043 · 2025-04-17T08:31:25.000+03:00
* Edit a selected text with a command - Ctrl+Shift+e for entering prompt, Tab for accepting the change.

* Code edits - reject the suggestion by pressing Escape

* Prompt for text edit is improved, context menu item for editing selected text added.

* Remove the context from the edit prompt as the output includes part of it; In the diff window show 25 lines before and after the change to facilitate comparison.

---------

Co-authored-by: igardev &lt;ivailo.gardev@akros.ch&gt;
diff --git a/package.json b/package.json
@@ -68,6 +68,18 @@
       {
         "command": "extension.askAiWithContext",
         "title": "Ask AI With Context"
+      },
+      {
+        "command": "extension.editSelectedText",
+        "title": "Edit Selected Text with AI"
+      },
+      {
+        "command": "extension.acceptTextEdit",
+        "title": "Accept Text Edit Suggestion"
+      },
+      {
+        "command": "extension.rejectTextEdit",
+        "title": "Reject Text Edit Suggestion"
       }
     ],
     "keybindings": [
@@ -126,6 +138,21 @@
         "command": "extension.askAiWithContext",
         "key": "ctrl+Shift+;",
         "when": "editorTextFocus"
+      },
+      {
+        "command": "extension.editSelectedText",
+        "key": "ctrl+shift+e",
+        "when": "editorHasSelection"
+      },
+      {
+        "command": "extension.acceptTextEdit",
+        "key": "tab",
+        "when": "editorTextFocus && textEditSuggestionVisible"
+      },
+      {
+        "command": "extension.rejectTextEdit",
+        "key": "escape",
+        "when": "editorTextFocus && textEditSuggestionVisible"
       }
     ],
     "configuration": {
@@ -283,6 +310,15 @@
           "description": "The prompt template to be used for the OpenAI compatible endpoint."
         }
       }
+    },
+    "menus": {
+      "editor/context": [
+        {
+          "command": "extension.editSelectedText",
+          "when": "editorHasSelection",
+          "group": "llama@1"
+        }
+      ]
     }
   },
   "scripts": {
diff --git a/src/application.ts b/src/application.ts
@@ -8,6 +8,7 @@ import {Menu} from "./menu";
 import {Completion} from "./completion";
 import {Logger} from "./logger";
 import { ChatWithAi } from "./chat-with-ai";
+import { TextEditor } from "./text-editor";
 
 export class Application {
     private static instance: Application;
@@ -21,6 +22,7 @@ export class Application {
     public completion: Completion
     public logger: Logger
     public askAi: ChatWithAi
+    public textEditor: TextEditor
 
     private constructor() {
         this.extConfig = new Configuration()
@@ -33,6 +35,7 @@ export class Application {
         this.completion = new Completion(this)
         this.logger = new Logger(this)
         this.askAi = new ChatWithAi(this)
+        this.textEditor = new TextEditor(this)
     }
 
     public static getInstance(): Application {
diff --git a/src/architect.ts b/src/architect.ts
@@ -31,7 +31,7 @@ export class Architect {
                     this.app.extraContext.pickChunkAroundCursor(previousEditor.selection.active.line, previousEditor.document);
                 }, 0);
             }
-            // Clarify if this should be executed if the above was executed
+            
             if (editor) {
                 // Editor is now active in the UI, pick a chunk
                 let activeDocument = editor.document;
@@ -238,9 +238,7 @@ export class Architect {
                 let activeDocument = editor.document;
                 const selection = editor.selection;
                 const cursorPosition = selection.active;
-                // setTimeout(async () => {
                 this.app.extraContext.pickChunkAroundCursor(cursorPosition.line, activeDocument);
-                // }, 0);
                 // Ensure ring chunks buffer will be updated
                 this.app.extraContext.lastComplStartTime = Date.now() - this.app.extConfig.RING_UPDATE_MIN_TIME_LAST_COMPL - 1
                 this.app.extraContext.periodicRingBufferUpdate()
@@ -249,4 +247,31 @@ export class Architect {
         });
         context.subscriptions.push(triggerAskAiDisposable);
     }
+
+    registerCommandEditSelectedText = (context: vscode.ExtensionContext) => {
+        const editSelectedTextDisposable = vscode.commands.registerCommand('extension.editSelectedText', async () => {
+            const editor = vscode.window.activeTextEditor;
+            if (!editor) {
+                vscode.window.showErrorMessage('No active editor!');
+                return;
+            }
+            await this.app.textEditor.showEditPrompt(editor);
+        });
+        context.subscriptions.push(editSelectedTextDisposable);
+    }
+
+    registerCommandAcceptTextEdit = (context: vscode.ExtensionContext) => {
+        const acceptTextEditDisposable = vscode.commands.registerCommand('extension.acceptTextEdit', async () => {
+            await this.app.textEditor.acceptSuggestion();
+        });
+        context.subscriptions.push(acceptTextEditDisposable);
+    }
+
+    registerCommandRejectTextEdit = (context: vscode.ExtensionContext) => {
+        context.subscriptions.push(
+            vscode.commands.registerCommand('extension.rejectTextEdit', () => {
+                this.app.textEditor.rejectSuggestion();
+            })
+        );
+    }
 }
diff --git a/src/chat-with-ai.ts b/src/chat-with-ai.ts
@@ -1,5 +1,6 @@
 import {Application} from "./application";
 import * as vscode from 'vscode';
+import {Utils} from "./utils";
 
 export class ChatWithAi {
     private app: Application
@@ -24,7 +25,7 @@ export class ChatWithAi {
              webviewIdentifier = 'htmlChatWithAiWithContextViewer'
              let chunksToSend = this.app.extraContext.chunks.filter((_, index) => !this.sentContextChunks.includes(this.app.extraContext.chunksHash[index]));
              let chunksToSendHash = this.app.extraContext.chunksHash.filter((item) => !this.sentContextChunks.includes(item));
-             if (chunksToSend.length > 0) extraCont = "Here are pieces of code from different files of the project: \n" + chunksToSend.reduce((accumulator, currentValue) => accumulator + "\nFile Name: " + currentValue.filename + "\nText:\n" +  currentValue.text + "\n\n" , "");
+             if (chunksToSend.length > 0) extraCont = Utils.getChunksInPlainText(chunksToSend);
              this.sentContextChunks.push(...chunksToSendHash)
              panelTitle = this.app.extConfig.getUiText("Chat with AI with project context")??""
         }
@@ -149,4 +150,6 @@ export class ChatWithAi {
         `;
     }
 
+
+
 }
diff --git a/src/extension.ts b/src/extension.ts
@@ -19,6 +19,9 @@ export function activate(context: vscode.ExtensionContext) {
     app.architect.registerCommandAcceptFirstLine(context);
     app.architect.registerCommandAcceptFirstWord(context);
     app.architect.registerCommandShowMenu(context);
+    app.architect.registerCommandEditSelectedText(context);
+    app.architect.registerCommandAcceptTextEdit(context);
+    app.architect.registerCommandRejectTextEdit(context);
 }
 
 export function deactivate() {
diff --git a/src/llama-server.ts b/src/llama-server.ts
@@ -1,6 +1,7 @@
 import axios from "axios";
 import {Application} from "./application";
 import vscode, { Terminal } from "vscode";
+import {Utils} from "./utils";
 
 const STATUS_OK = 200;
 
@@ -19,6 +20,11 @@ export interface LlamaResponse {
     };
 }
 
+export interface LlamaChatResponse {
+    choices: [{message:{content?: string}}];
+}
+
+
 export class LlamaServer {
     private app: Application
     private vsCodeFimTerminal: Terminal | undefined;
@@ -115,6 +121,73 @@ export class LlamaServer {
         };
     }
 
+    private createChatRequestPayload(noPredict: boolean, instructions: string, originalText: string, chunks: any[], context: string, nindent?: number) {
+        const CHUNKS_PLACEHOLDER = "[chunks]";
+        const INSTRUCTIONS_PLACEHOLDER = "[instructions]";
+        const ORIGINAL_TEXT_PLACEHOLDER = "[originalText]";
+        const CONTEXT_PLACEHOLDER = "[context]";
+        let editTextTemplate = `${CHUNKS_PLACEHOLDER}\n\nModify the following original code according to the instructions. Output only the modified code. No explanations.\n\ninstructions:\n${INSTRUCTIONS_PLACEHOLDER}\n\noriginal code:\n${ORIGINAL_TEXT_PLACEHOLDER}\n\nmodified code:`
+        if (noPredict) {
+            return {
+                // input_extra: chunks,
+                "messages": [
+              {
+                "role": "system",
+                "content": "You are an expert coder."
+              },
+              {
+                "role": "user",
+                "content": Utils.getChunksInPlainText(chunks)
+              }
+            ],
+                n_predict: 0,
+                samplers: [],
+                cache_prompt: true,
+                t_max_prompt_ms: this.app.extConfig.t_max_prompt_ms,
+                t_max_predict_ms: 1,
+                ...(this.app.extConfig.lora_completion.trim() != "" && { lora: [{ id: 0, scale: 0.5 }] })
+            };
+        }
+        
+        return {
+            "messages": [
+              {
+                "role": "system",
+                "content": "You are an expert coder."
+              },
+              {
+                "role": "user",
+                "content": editTextTemplate.replace(CHUNKS_PLACEHOLDER, Utils.getChunksInPlainText(chunks))
+                            .replace(INSTRUCTIONS_PLACEHOLDER, instructions).replace(ORIGINAL_TEXT_PLACEHOLDER, originalText)
+                            .replace(CONTEXT_PLACEHOLDER, context)
+              }
+            ],
+            "stream": false,
+            "cache_prompt": true,
+            "samplers": "edkypmxt",
+            "temperature": 0.8,
+            "dynatemp_range": 0,
+            "dynatemp_exponent": 1,
+            "top_k": 40,
+            "top_p": 0.95,
+            "min_p": 0.05,
+            "typical_p": 1,
+            "xtc_probability": 0,
+            "xtc_threshold": 0.1,
+            "repeat_last_n": 64,
+            "repeat_penalty": 1,
+            "presence_penalty": 0,
+            "frequency_penalty": 0,
+            "dry_multiplier": 0,
+            "dry_base": 1.75,
+            "dry_allowed_length": 2,
+            "dry_penalty_last_n": -1,
+            "max_tokens": -1,
+            "timings_per_token": false,
+            ...(this.app.extConfig.lora_chat.trim() != "" && { lora: [{ id: 0, scale: 0.5 }] })
+          };
+    }
+
 
     getFIMCompletion = async (
         inputPrefix: string,
@@ -139,6 +212,22 @@ export class LlamaServer {
         return response.status === STATUS_OK ? response.data : undefined;
     };
 
+    getChatCompletion = async (
+        instructions: string,
+        originalText: string,
+        context: string,
+        chunks: any,
+        nindent: number
+    ): Promise<LlamaChatResponse | undefined> => {
+        const response = await axios.post<LlamaChatResponse>(
+            `${this.app.extConfig.endpoint_chat}/v1/chat/completions`,
+            this.createChatRequestPayload(false, instructions, originalText, chunks, context, nindent),
+            this.app.extConfig.axiosRequestConfig
+        );
+
+        return response.status === STATUS_OK ? response.data : undefined;
+    };
+
     updateExtraContext = (chunks: any[]): void => {
         // If the server is OpenAI compatible, use the OpenAI API to prepare for the next FIM
         if (this.app.extConfig.use_openai_endpoint) {
@@ -151,6 +240,13 @@ export class LlamaServer {
             this.createRequestPayload(true, "", "", chunks, "", undefined),
             this.app.extConfig.axiosRequestConfig
         );
+
+        // make a request to the API to prepare for the next chat request
+        axios.post<LlamaResponse>(
+            `${this.app.extConfig.endpoint_chat}/v1/chat/completions`,
+            this.createChatRequestPayload(true, "", "", chunks, "", undefined),
+            this.app.extConfig.axiosRequestConfig
+        );
     };
 
     shellFimCmd = (launchCmd: string): void => {
diff --git a/src/text-editor.ts b/src/text-editor.ts
diff --git a/src/utils.ts b/src/utils.ts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`import {Application} from "./application";`
`2`	`2`	`import * as vscode from 'vscode';`
	`3`	`+import {Utils} from "./utils";`
`3`	`4`
`4`	`5`	`export class ChatWithAi {`
`5`	`6`	`private app: Application`
`@@ -24,7 +25,7 @@ export class ChatWithAi {`
`24`	`25`	`webviewIdentifier = 'htmlChatWithAiWithContextViewer'`
`25`	`26`	`let chunksToSend = this.app.extraContext.chunks.filter((_, index) => !this.sentContextChunks.includes(this.app.extraContext.chunksHash[index]));`
`26`	`27`	`let chunksToSendHash = this.app.extraContext.chunksHash.filter((item) => !this.sentContextChunks.includes(item));`
`27`		`- if (chunksToSend.length > 0) extraCont = "Here are pieces of code from different files of the project: \n" + chunksToSend.reduce((accumulator, currentValue) => accumulator + "\nFile Name: " + currentValue.filename + "\nText:\n" + currentValue.text + "\n\n" , "");`
	`28`	`+ if (chunksToSend.length > 0) extraCont = Utils.getChunksInPlainText(chunksToSend);`
`28`	`29`	`this.sentContextChunks.push(...chunksToSendHash)`
`29`	`30`	`panelTitle = this.app.extConfig.getUiText("Chat with AI with project context")??""`
`30`	`31`	`}`
`@@ -149,4 +150,6 @@ export class ChatWithAi {`
`149`	`150`	`;
`150`	`151`	`}`
`151`	`152`
	`153`	`+`
	`154`	`+`
`152`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@ export function activate(context: vscode.ExtensionContext) {`
`19`	`19`	`app.architect.registerCommandAcceptFirstLine(context);`
`20`	`20`	`app.architect.registerCommandAcceptFirstWord(context);`
`21`	`21`	`app.architect.registerCommandShowMenu(context);`
	`22`	`+ app.architect.registerCommandEditSelectedText(context);`
	`23`	`+ app.architect.registerCommandAcceptTextEdit(context);`
	`24`	`+ app.architect.registerCommandRejectTextEdit(context);`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`export function deactivate() {`