From f6ea8494a72e4884c955b2d9ab35df2e4f44c8d3 Mon Sep 17 00:00:00 2001 From: Falko Habel Date: Mon, 7 Oct 2024 09:22:02 +0200 Subject: [PATCH] accept and decline is working --- src/extension.ts | 52 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index ff82814..53614c6 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -176,32 +176,62 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo } }); + // Handles Enter key separately vscode.workspace.onDidChangeTextDocument(async (event) => { const textEditor = vscode.window.activeTextEditor; if (!textEditor || event.document.uri.toString() !== textEditor.document.uri.toString() || !previewInserted || isHandlingChange) { return; } - + isHandlingChange = true; - + try { for (const change of event.contentChanges) { const changeStartLine = change.range.start.line; - - // Detect Backspace by a single-character deletion - if (change.text === '' && change.rangeLength === 1 && changeStartLine >= previewStartLine) { - await restoreOriginalContent(); + + if (change.text.includes('\n') && changeStartLine >= previewStartLine) { + // Accept the preview and move to the next line + await acceptPreview(textEditor, textEditor.document, startLine, textEditor.selection.active, completionText); + await vscode.commands.executeCommand('default:type', { text: '\n' }); + break; } - - // Detect Tab key press by checking if the inserted text is a tab character - if (change.text === '\t' && changeStartLine >= previewStartLine) { - await acceptPreview(textEditor, event.document, startLine, textEditor.selection.active, completionText); + + // Handle Backspace + if (change.text === '' && change.rangeLength === 1 && changeStartLine >= previewStartLine) { + // Discard the preview if Backspace is pressed + await restoreOriginalContent(); + break; } } } finally { isHandlingChange = false; } }); + + vscode.window.onDidChangeTextEditorSelection(async (event) => { + const textEditor = vscode.window.activeTextEditor; + if (!textEditor || !previewInserted || isHandlingChange) { + return; + } + + isHandlingChange = true; + + try { + // Handle arrow keys or any other navigation keys + const currentSelection = event.selections[0]; + const { document } = textEditor; + + // Detect unwanted acceptance from simple navigation + if (currentSelection.start.line < previewStartLine) { + await restoreOriginalContent(); + } + } finally { + isHandlingChange = false; + } + }); + + + // Restore original content if Backspace is pressed (decline the preview) const restoreOriginalContent = async () => { @@ -221,7 +251,6 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo // Accept the preview when Tab is pressed const acceptPreview = async (textEditor: vscode.TextEditor, document: vscode.TextDocument, startLine: number, position: vscode.Position, completionText: string) => { - console.log("Accepting preview with completion text:", completionText); textEditor.setDecorations(previewDecorationType, []); const edit = new vscode.WorkspaceEdit(); @@ -237,7 +266,6 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo disposable.dispose(); // Cancel listener when preview is accepted previewInserted = false; - console.log("Preview accepted"); }; // Call this function to initiate the preview