Compare commits

...

2 Commits

1 changed files with 80 additions and 24 deletions

View File

@ -116,6 +116,8 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
let previewInserted = false; let previewInserted = false;
let originalContent: string; let originalContent: string;
let previewStartLine: number; let previewStartLine: number;
const storeAndInsertPreview = async () => { const storeAndInsertPreview = async () => {
previewStartLine = startLine; previewStartLine = startLine;
const endLine = document.lineCount - 1; const endLine = document.lineCount - 1;
@ -148,28 +150,80 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
textEditor.setDecorations(previewDecorationType, previewRanges); textEditor.setDecorations(previewDecorationType, previewRanges);
previewInserted = true; previewInserted = true;
}; };
const disposable = vscode.window.onDidChangeTextEditorSelection(async (event) => {
const disposable = vscode.workspace.onDidChangeTextDocument(async (event) => { const textEditor = vscode.window.activeTextEditor;
if (!textEditor || !previewInserted || isHandlingChange) {
return;
}
isHandlingChange = true;
try {
const activeSelection = textEditor.selection;
const changeStartLine = activeSelection.active.line;
// Detect Tab key press by checking the active selection
if (event.kind === vscode.TextEditorSelectionChangeKind.Keyboard && changeStartLine >= previewStartLine) {
const changeText = textEditor.document.getText(activeSelection);
if (changeText === '') {
// Tab key (empty selection) -> Accept the preview
await acceptPreview(textEditor, textEditor.document, startLine, activeSelection.active, completionText);
}
}
} finally {
isHandlingChange = false;
}
});
// Handles Enter key separately
vscode.workspace.onDidChangeTextDocument(async (event) => {
const textEditor = vscode.window.activeTextEditor; const textEditor = vscode.window.activeTextEditor;
if (!textEditor || event.document.uri.toString() !== textEditor.document.uri.toString() || !previewInserted || isHandlingChange) { if (!textEditor || event.document.uri.toString() !== textEditor.document.uri.toString() || !previewInserted || isHandlingChange) {
return; return;
} }
isHandlingChange = true; isHandlingChange = true;
try { try {
for (const change of event.contentChanges) { for (const change of event.contentChanges) {
const changeStartLine = change.range.start.line; const changeStartLine = change.range.start.line;
// Detect Backspace by a single-character deletion 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;
}
// Handle Backspace
if (change.text === '' && change.rangeLength === 1 && changeStartLine >= previewStartLine) { if (change.text === '' && change.rangeLength === 1 && changeStartLine >= previewStartLine) {
// Discard the preview if Backspace is pressed
await restoreOriginalContent(); await restoreOriginalContent();
break;
} }
}
// Detect Tab key press } finally {
if (change.text === '\t' && changeStartLine >= previewStartLine) { isHandlingChange = false;
await acceptPreview(textEditor, event.document, startLine, textEditor.selection.active, completionText); }
} });
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 { } finally {
isHandlingChange = false; isHandlingChange = false;
@ -178,45 +232,47 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
// Restore original content if Backspace is pressed (decline the preview)
const restoreOriginalContent = async () => { const restoreOriginalContent = async () => {
if (!previewInserted) return; if (!previewInserted) return;
const endLine = document.lineCount - 1; const endLine = document.lineCount - 1;
const fullRange = new vscode.Range(previewStartLine, 0, endLine, document.lineAt(endLine).text.length); const fullRange = new vscode.Range(previewStartLine, 0, endLine, document.lineAt(endLine).text.length);
const edit = new vscode.WorkspaceEdit(); const edit = new vscode.WorkspaceEdit();
edit.replace(document.uri, fullRange, originalContent); edit.replace(document.uri, fullRange, originalContent);
await vscode.workspace.applyEdit(edit); await vscode.workspace.applyEdit(edit);
textEditor.setDecorations(previewDecorationType, []); textEditor.setDecorations(previewDecorationType, []);
previewInserted = false; previewInserted = false;
disposable.dispose(); disposable.dispose(); // Cancel listener when preview is discarded
}; };
// Modify the acceptPreview function to match the working version // Accept the preview when Tab is pressed
const acceptPreview = async (textEditor: vscode.TextEditor, document: vscode.TextDocument, startLine: number, position: vscode.Position, completionText: string) => { 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, []); textEditor.setDecorations(previewDecorationType, []);
const edit = new vscode.WorkspaceEdit(); const edit = new vscode.WorkspaceEdit();
// Adjust the insertion logic to avoid duplicate newlines // Adjust the insertion logic to avoid duplicate newlines
const insertText = completionText; const insertText = completionText;
// Replace the range from the start of the context to the current position // Replace the range from the start of the context to the current position
const replaceRange = new vscode.Range(startLine, 0, position.line, position.character); const replaceRange = new vscode.Range(startLine, 0, position.line, position.character);
edit.replace(document.uri, replaceRange, insertText); edit.replace(document.uri, replaceRange, insertText);
await vscode.workspace.applyEdit(edit); await vscode.workspace.applyEdit(edit);
await document.save(); await document.save();
disposable.dispose(); disposable.dispose(); // Cancel listener when preview is accepted
previewInserted = false; previewInserted = false;
console.log("Preview accepted");
}; };
// Call this function to initiate the preview // Call this function to initiate the preview
await storeAndInsertPreview(); await storeAndInsertPreview();
} catch (err: any) { } catch (err: any) {
vscode.window.showErrorMessage( vscode.window.showErrorMessage(