Final Version 0.2.0

package.json

@@ -1,10 +1,10 @@
 {
   "name": "fabelous-autocoder",
-	"version": "0.1.8",
+  "version": "0.2.0",
   "displayName": "Fabelous Autocoder",
   "description": "A simple to use Ollama autocompletion Plugin",
   "icon": "icon.png",
-	"publisher": "fabel",
+  "publisher": "Falko Habel",
   "license": "CC BY-ND 4.0",
   "bugs": {
     "url": "https://gitea.fabelous.app/fabel/Fabelous-Autocoder/issues"
@@ -90,7 +90,6 @@
           "type": "boolean",
           "default": true,
           "description": "Ollama continues autocompletion after what is previewed inline. Disabling disables that feature as some may find it irritating. Multiline completion is still accessible through the shortcut even after disabling."
-
         },
         "fabelous-autocoder.temperature": {
           "type": "number",
@@ -104,18 +103,36 @@
         },
         "fabelous-autocoder.top p": {
           "type": "number",
+          "default": 1,
           "description": "Top p sampling for the model."
+        },
+        "fabelous-autocoder.enableLineByLineAcceptance": {
+          "type": "boolean",
+          "default": false,
+          "description": "Enable line-by-line acceptance of the generated code."
         }
       }
     },
+    "keybindings": [
+        {
+          "command": "fabelous-autocoder.handleTab",
+          "key": "tab",
+          "when": "editorTextFocus && !editorTabMovesFocus"
+        },
+        {
+          "command": "fabelous-autocoder.handleBackspace",
+          "key": "backspace",
+          "when": "editorTextFocus"
+        }
+    ],
     "commands": [
       {
         "command": "fabelous-autocoder.autocomplete",
-			  "title": "Fabelous autocompletion"
+        "title": "Fabelous Autocompletion"
       },
       {
-				"command": "fabelous-autocoder.acceptCompletion",
+        "command": "fabelous-autocoder.handleTab",
-				"title": "Accept Fabelous Autocompletion"
+        "title": "Handle Tab"
       }
     ]
   },

src/extension.ts

@@ -1,268 +1,328 @@
-import * as vscode from "vscode";
+import * as vscode from 'vscode';
-import axios from "axios";
+import axios from 'axios';
 
-let VSConfig: vscode.WorkspaceConfiguration;
+let config: {
-let apiEndpoint: string;
+    apiEndpoint: string;
-let apiAuthentication: string;
+    apiAuthentication: string;
-let apiModel: string;
+    apiModel: string;
-let apiTemperature: number;
+    apiTemperature: number;
-let numPredict: number;
+    numPredict: number;
-let promptWindowSize: number;
+    promptWindowSize: number;
-let completionKeys: string;
+    completionKeys: string[];
-let responsePreview: boolean | undefined;
+    responsePreview: boolean;
-let responsePreviewMaxTokens: number;
+    responsePreviewMaxTokens: number;
-let responsePreviewDelay: number;
+    responsePreviewDelay: number;
-let continueInline: boolean | undefined;
+    continueInline: boolean;
-let keepAlive: number | undefined;
+    keepAlive: number;
-let topP: number | undefined;
+    topP: number;
-let inlinePreviewDecoration: vscode.TextEditorDecorationType;
+};
-let currentPreviewText: string | undefined;
 
-function createInlinePreviewDecoration() {
+let previewDecorationType: vscode.TextEditorDecorationType;
-    return vscode.window.createTextEditorDecorationType({
+let activeCompletionManager: CompletionManager | null = null;
+
+function updateConfig() {
+    const vsConfig = vscode.workspace.getConfiguration('fabelous-autocoder');
+    config = {
+        apiEndpoint: vsConfig.get('endpoint') || 'http://localhost:11434/api/generate',
+        apiAuthentication: vsConfig.get('authentication') || '',
+        apiModel: vsConfig.get('model') || 'fabelous-coder:latest',
+        apiTemperature: vsConfig.get('temperature') || 0.7,
+        numPredict: vsConfig.get('max tokens predicted') || 1000,
+        promptWindowSize: vsConfig.get('prompt window size') || 2000,
+        completionKeys: (vsConfig.get('completion keys') as string || ' ').split(''),
+        responsePreview: vsConfig.get('response preview') || false,
+        responsePreviewMaxTokens: vsConfig.get('preview max tokens') || 50,
+        responsePreviewDelay: vsConfig.get('preview delay') || 0,
+        continueInline: vsConfig.get('continue inline') || false,
+        keepAlive: vsConfig.get('keep alive') || 30,
+        topP: vsConfig.get('top p') || 1,
+    };
+}
+
+function createPreviewDecorationType() {
+    previewDecorationType = vscode.window.createTextEditorDecorationType({
         after: {
-            color: '#808080',
+            color: '#888888',
-            fontStyle: 'italic'
+            fontStyle: 'italic',
-        }
+        },
+        textDecoration: 'none; display: none;',
     });
 }
 
-function updateVSConfig() {
-    VSConfig = vscode.workspace.getConfiguration("fabelous-autocoder");
-    apiEndpoint = VSConfig.get("endpoint") || "http://localhost:11434/api/generate";
-    apiAuthentication = VSConfig.get("authentication") || "";
-    apiModel = VSConfig.get("model") || "fabelous-coder:latest";
-    numPredict = VSConfig.get("max tokens predicted") || 1000;
-    promptWindowSize = VSConfig.get("prompt window size") || 2000;
-    completionKeys = VSConfig.get("completion keys") || " ";
-    // Here's where the response preview setting is read
-    responsePreview = VSConfig.get("response preview");
-    responsePreviewMaxTokens = VSConfig.get("preview max tokens") || 50;
-    responsePreviewDelay = VSConfig.get("preview delay") || 0;
-    continueInline = VSConfig.get("continue inline");
-    apiTemperature = VSConfig.get("temperature") || 0.7;
-    keepAlive = VSConfig.get("keep alive") || 30;
-    topP = VSConfig.get("top p") || 1;
-}
-
-updateVSConfig();
-vscode.workspace.onDidChangeConfiguration(updateVSConfig);
-
 function getContextLines(document: vscode.TextDocument, position: vscode.Position): string {
-    const lines = [];
     const startLine = Math.max(0, position.line - 1);
     const endLine = position.line;
-
+    return document.getText(new vscode.Range(startLine, 0, endLine, position.character));
-    for (let i = startLine; i <= endLine; i++) {
-        lines.push(document.lineAt(i).text);
-    }
-
-    return lines.join("\n");
 }
 
 function createFIMPrompt(prefix: string, language: string): string {
     return `<fim_prefix>${prefix}<fim_middle><fim_suffix>${language}\n`;
 }
 
-async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationToken?: vscode.CancellationToken) {
+async function generateCompletion(prompt: string, cancellationToken: vscode.CancellationToken): Promise<string> {
-    const document = textEditor.document;
-    const position = textEditor.selection.active;
-
-    const context = getContextLines(document, position);
-
-    const fimPrompt = createFIMPrompt(context, document.languageId);
-
-    vscode.window.withProgress(
-        {
-            location: vscode.ProgressLocation.Notification,
-            title: "Fabelous Autocoder",
-            cancellable: true,
-        },
-        async (progress, progressCancellationToken) => {
-            try {
-                progress.report({ message: "Starting model..." });
-
-                let axiosCancelPost: () => void;
     const axiosCancelToken = new axios.CancelToken((c) => {
-                    axiosCancelPost = () => {
+        cancellationToken.onCancellationRequested(() => c('Request cancelled'));
-                        c("Autocompletion request terminated by user cancel");
-                    };
-                    if (cancellationToken) cancellationToken.onCancellationRequested(axiosCancelPost);
-                    progressCancellationToken.onCancellationRequested(axiosCancelPost);
-                    vscode.workspace.onDidCloseTextDocument(axiosCancelPost);
     });
 
-                const response = await axios.post(apiEndpoint, {
+    const response = await axios.post(config.apiEndpoint, {
-                    model: apiModel,
+        model: config.apiModel,
-                    prompt: fimPrompt,
+        prompt: prompt,
         stream: false,
         raw: true,
         options: {
-                        num_predict: numPredict,
+            num_predict: config.numPredict,
-                        temperature: apiTemperature,
+            temperature: config.apiTemperature,
-                        stop: ["<fim_suffix>", "```"]
+            stop: ['<fim_suffix>', '```'],
+            keep_alive: config.keepAlive,
+            top_p: config.topP,
         }
     }, {
         cancelToken: axiosCancelToken,
         headers: {
-                        'Authorization': apiAuthentication
+            'Authorization': config.apiAuthentication
         }
     });
 
-                progress.report({ message: "Generating..." });
+    return response.data.response.replace(/<fim_middle>|<fim_suffix>|<fim_prefix>/g, '').trim();
+}
 
-                let completionText = response.data.response;
+class CompletionManager {
-                // Remove any FIM tags and leading/trailing whitespace
+    private textEditor: vscode.TextEditor;
-                completionText = completionText.replace(/<fim_middle>|<fim_suffix>|<fim_prefix>/g, '').trim();
+    private document: vscode.TextDocument;
+    private startPosition: vscode.Position;
+    private completionText: string;
+    private insertedLineCount: number = 0; // Track the number of inserted lines
 
-                // Remove the context lines
+    constructor(textEditor: vscode.TextEditor, startPosition: vscode.Position, completionText: string) {
-                const startLine = Math.max(0, position.line - 1);
+        this.textEditor = textEditor;
-                const endLine = position.line;
+        this.document = textEditor.document;
+        this.startPosition = startPosition;
+        this.completionText = completionText;
+    }
+
+    public async showPreview() {
+        if (!previewDecorationType) {
+            createPreviewDecorationType();
+        }
+    
+        const completionLines = this.completionText.split('\n').length;
+    
+        // Adjust the start position to line after the original start position
+        const adjustedStartPosition = this.startPosition.translate(0, 0);
+    
+        // Step 1: Insert blank lines to make space for the preview
+        const edit = new vscode.WorkspaceEdit();
+        const linePadding = '\n'.repeat(completionLines + 1); // Include extra line break for visual separation
+        edit.insert(this.document.uri, adjustedStartPosition, linePadding);
+        await vscode.workspace.applyEdit(edit);
+    
+        this.insertedLineCount = completionLines + 1;
+    
+        // Step 2: Apply decorations
+        const previewRanges: vscode.DecorationOptions[] = this.completionText.split('\n').map((line, index) => {
+            const lineNumber = adjustedStartPosition.line + index + 1; // Start preview one line later
+            return {
+                range: new vscode.Range(
+                    new vscode.Position(lineNumber, 0),
+                    new vscode.Position(lineNumber, 0)
+                ),
+                renderOptions: {
+                    after: {
+                        contentText: line,
+                        color: '#888888',
+                        fontStyle: 'italic',
+                    },
+                },
+            };
+        });
+    
+        this.textEditor.setDecorations(previewDecorationType, previewRanges);
+    }
+    
+
+    public async acceptCompletion() {
+        const edit = new vscode.WorkspaceEdit();
+        const completionLines = this.completionText.split('\n');
+        const numberOfLines = completionLines.length;
+        
+        // Ensure the start position is never negative
+        const safeStartPosition = new vscode.Position(Math.max(0, this.startPosition.line - 1), 0);
+
+        // Prepare the range to replace
         const rangeToReplace = new vscode.Range(
+            safeStartPosition,
+            this.startPosition.translate(numberOfLines, 0)
+        );
+
+        // Construct the content to insert
+        const contentToInsert = (safeStartPosition.line === 0 ? '' : '\n') + this.completionText + '\n';
+        edit.replace(this.document.uri, rangeToReplace, contentToInsert);
+        
+        await vscode.workspace.applyEdit(edit);
+        
+        // Clear the preview decorations
+        this.clearPreview();
+
+        // Set activeCompletionManager to null
+        activeCompletionManager = null;
+
+        // Calculate the new cursor position from the inserted content 
+        const lastCompletionLine = completionLines[completionLines.length - 1];
+        const newPosition = new vscode.Position(
+            this.startPosition.line + numberOfLines - 1, 
+            lastCompletionLine.length
+        );
+
+        // Set the new cursor position
+        this.textEditor.selection = new vscode.Selection(newPosition, newPosition);
+    }
+
+    
+
+    public clearPreview() {
+        this.textEditor.setDecorations(previewDecorationType, []);  // Remove all preview decorations
+    }
+
+    public async declineCompletion() {
+        this.clearPreview();  // Clear the preview decorations
+    
+        try {
+            const document = this.textEditor.document;
+            const currentPosition = this.textEditor.selection.active;
+    
+            // Calculate the range of lines to remove
+            const startLine = this.startPosition.line + 1;
+            const endLine = currentPosition.line;
+            if (endLine > startLine) {
+                const workspaceEdit = new vscode.WorkspaceEdit();
+    
+                // Create a range from start of startLine to end of endLine
+                const range = new vscode.Range(
                     new vscode.Position(startLine, 0),
                     new vscode.Position(endLine, document.lineAt(endLine).text.length)
                 );
     
+                // Delete the range
+                workspaceEdit.delete(document.uri, range);
+    
                 // Apply the edit
-                const edit = new vscode.WorkspaceEdit();
+                await vscode.workspace.applyEdit(workspaceEdit);
-                edit.replace(document.uri, rangeToReplace, completionText);
-                await vscode.workspace.applyEdit(edit);
     
-                // Move the cursor to the end of the inserted text
+                // Move the cursor back to the original position
-                const newPosition = new vscode.Position(startLine + completionText.split('\n').length - 1, completionText.split('\n').pop()!.length);
+                this.textEditor.selection = new vscode.Selection(this.startPosition, this.startPosition);
-                textEditor.selection = new vscode.Selection(newPosition, newPosition);
+    
+                console.log(`Lines ${startLine + 1} to ${endLine + 1} removed successfully`);
+                activeCompletionManager = null;
+            } else {
+                console.log('No lines to remove');
+            }
+        } catch (error) {
+            console.error('Error declining completion:', error);
+            vscode.window.showErrorMessage(`Error removing lines: ${error}`);
+        }
+    }
+}
+
+ 
+async function autocompleteCommand(textEditor: vscode.TextEditor, edit: vscode.TextEditorEdit, ...args: any[]) {
+    const cancellationTokenSource = new vscode.CancellationTokenSource();
+    const cancellationToken = cancellationTokenSource.token;
+
+    try {
+        const document = textEditor.document;
+        const position = textEditor.selection.active;
+        const context = getContextLines(document, position);
+        const fimPrompt = createFIMPrompt(context, document.languageId);
+
+        const completionText = await vscode.window.withProgress({
+            location: vscode.ProgressLocation.Notification,
+            title: 'Fabelous Autocoder',
+            cancellable: true,
+        }, async (progress, progressCancellationToken) => {
+            progress.report({ message: 'Generating...' });
+            return await generateCompletion(fimPrompt, progressCancellationToken);
+        });
+
+        console.log('Completion generated:', completionText);
+
+
+        const completionManager = new CompletionManager(textEditor, position, completionText);
+        await completionManager.showPreview();
+        activeCompletionManager = completionManager;
 
-                progress.report({ message: "Fabelous completion finished." });
 
     } catch (err: any) {
-                vscode.window.showErrorMessage(
+        console.error('Error in autocompleteCommand:', err);
-                    "Fabelous Autocoder encountered an error: " + err.message
+        vscode.window.showErrorMessage(`Fabelous Autocoder encountered an error: ${err.message}`);
-                );
+    } finally {
-                console.log(err);
+        cancellationTokenSource.dispose();
     }
+}
+
+async function handleTab() {
+    if (activeCompletionManager) {
+        await activeCompletionManager.acceptCompletion();
+    } else {
+        await vscode.commands.executeCommand('tab');
+    }
+}
+
+async function handleBackspace() {
+    if (activeCompletionManager) {
+        await activeCompletionManager.declineCompletion();
+    } else {
+        await vscode.commands.executeCommand('deleteLeft');
     }
-    );
 }
 
 async function provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, cancellationToken: vscode.CancellationToken) {
-    const item = new vscode.CompletionItem("Fabelous autocompletion");
+    const item = new vscode.CompletionItem('Fabelous autocompletion');
     item.insertText = new vscode.SnippetString('${1:}');
+    item.documentation = new vscode.MarkdownString('Press `Enter` to get an autocompletion from Fabelous Autocoder');
 
-    // This is where the response preview functionality is implemented
+    if (config.responsePreview) {
-    if (responsePreview) {
+        await new Promise(resolve => setTimeout(resolve, config.responsePreviewDelay * 1000));
-        await new Promise(resolve => setTimeout(resolve, responsePreviewDelay * 1000));
         if (cancellationToken.isCancellationRequested) {
-            return [ item ];
+            return [item];
         }
 
         const context = getContextLines(document, position);
         const fimPrompt = createFIMPrompt(context, document.languageId);
 
         try {
-            const response_preview = await axios.post(apiEndpoint, {
+            const result = await generateCompletion(fimPrompt, cancellationToken);
-                model: apiModel,
+            const preview = (result as any).preview;
-                prompt: fimPrompt,
+            if (preview) {
-                stream: false,
+                item.detail = preview.split('\n')[0];
-                raw: true,
-                options: {
-                    num_predict: responsePreviewMaxTokens,
-                    temperature: apiTemperature,
-                    stop: ['<fim_suffix>', '\n', '```'],
-                    ...(keepAlive && { keep_alive: keepAlive }),
-                    ...(topP && { top_p: topP }),
-                }
-            });
-
-            currentPreviewText = response_preview.data.response.replace(/<fim_middle>|<fim_suffix>|<fim_prefix>/g, '').trim();
-            updateInlinePreview(document, position);
-
-            if (currentPreviewText) {
-                item.label = currentPreviewText.split('\n')[0];
             }
         } catch (error) {
-            console.error("Error fetching preview:", error);
+            console.error('Error fetching preview:', error);
         }
     }
 
-    item.documentation = new vscode.MarkdownString('Press `Enter` to accept the autocompletion, or `Escape` to dismiss');
+    if (config.continueInline || !config.responsePreview) {
         item.command = {
-        command: 'fabelous-autocoder.acceptCompletion',
+            command: 'fabelous-autocoder.autocomplete',
-        title: 'Accept Fabelous Autocompletion',
+            title: 'Fabelous Autocomplete',
+            arguments: []
         };
+    }
 
     return [item];
 }
+export function activate(context: vscode.ExtensionContext) {
+    updateConfig();
+    createPreviewDecorationType();
 
-function removeInlinePreview() {
+    context.subscriptions.push(
-    const editor = vscode.window.activeTextEditor;
+        vscode.workspace.onDidChangeConfiguration(updateConfig),
-    if (editor) {
+        vscode.languages.registerCompletionItemProvider('*', { provideCompletionItems }, ...config.completionKeys),
-        editor.setDecorations(inlinePreviewDecoration, []);
+        vscode.commands.registerTextEditorCommand('fabelous-autocoder.autocomplete', autocompleteCommand),
-    }
+        vscode.commands.registerCommand('fabelous-autocoder.handleTab', handleTab),
-    currentPreviewText = undefined;
+        vscode.commands.registerCommand('fabelous-autocoder.handleBackspace', handleBackspace)  // Add this line
-}
-
-function acceptCompletion() {
-    const editor = vscode.window.activeTextEditor;
-    if (editor && currentPreviewText) {
-        editor.edit(editBuilder => {
-            const position = editor.selection.active;
-            editBuilder.insert(position, currentPreviewText as string);
-        });
-        removeInlinePreview();
-    }
-}
-
-function activate(context: vscode.ExtensionContext) {
-    inlinePreviewDecoration = createInlinePreviewDecoration();
-
-    const completionProvider = vscode.languages.registerCompletionItemProvider("*", {
-        provideCompletionItems
-    },
-        ...completionKeys.split("")
     );
-
-    const acceptCompletionCommand = vscode.commands.registerCommand(
-        "fabelous-autocoder.acceptCompletion",
-        acceptCompletion
-    );
-
-    context.subscriptions.push(completionProvider);
-    context.subscriptions.push(acceptCompletionCommand);
-
-    // Handle Escape key to remove preview
-    context.subscriptions.push(vscode.commands.registerCommand('type', args => {
-        if (args.text === 'Escape') {
-            removeInlinePreview();
-        }
-        return vscode.commands.executeCommand('default:type', args);
-    }));
-
-    // Remove preview when cursor moves
-    context.subscriptions.push(vscode.window.onDidChangeTextEditorSelection(() => {
-        removeInlinePreview();
-    }));
 }
 
-function updateInlinePreview(document: vscode.TextDocument, position: vscode.Position) {
-    if (currentPreviewText) {
-        const editor = vscode.window.activeTextEditor;
-        if (editor && editor.document === document) {
-            const decorations = [{
-                range: new vscode.Range(position, position),
-                renderOptions: {
-                    after: {
-                        contentText: currentPreviewText
-                    }
-                }
-            }];
-            editor.setDecorations(inlinePreviewDecoration, decorations);
-        }
-    }
-}
 
-function deactivate() { }
 
-export {
+export function deactivate() {}
-    activate,
-    deactivate,
-};