Fabel/Fabelous-Autocoder
Fabel
/
Fabelous-Autocoder
0
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 3 Wiki Activity

Compare commits

base: Fabel:f6ea8494a72e4884c955b2d9ab35df2e4f44c8d3
Branches Tags
Fabel:main
Fabel:develop
Fabel:remove_compeltion_items
Fabel:docs
Fabel:preview_lines
Fabel:0.2.1
Fabel:0.2.0
Fabel:0.1.7
Fabel:0.0.35
..
compare: Fabel:804a3113e45d3a70a28e80ed8c37322f68c1496f
Branches Tags
Fabel:develop
Fabel:remove_compeltion_items
Fabel:main
Fabel:docs
Fabel:preview_lines
Fabel:0.2.1
Fabel:0.2.0
Fabel:0.1.7
Fabel:0.0.35

No commits in common. "f6ea8494a72e4884c955b2d9ab35df2e4f44c8d3" and "804a3113e45d3a70a28e80ed8c37322f68c1496f" have entirely different histories.
f6ea8494a7 ... 804a3113e4

1 changed files with 34 additions and 90 deletions
Show Stats Expand all files Collapse all files

80
src/extension.ts
View File

@ -116,8 +116,6 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
let previewInserted = false;
let originalContent: string;
let previewStartLine: number;
const storeAndInsertPreview = async () => {
previewStartLine = startLine;
const endLine = document.lineCount - 1;
@ -150,34 +148,8 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
textEditor.setDecorations(previewDecorationType, previewRanges);
previewInserted = true;
};
const disposable = vscode.window.onDidChangeTextEditorSelection(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 disposable = vscode.workspace.onDidChangeTextDocument(async (event) => {
const textEditor = vscode.window.activeTextEditor;
if (!textEditor || event.document.uri.toString() !== textEditor.document.uri.toString() || !previewInserted || isHandlingChange) {
return;
@ -189,41 +161,15 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
for (const change of event.contentChanges) {
const changeStartLine = change.range.start.line;
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
// Detect Backspace by a single-character deletion
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();
// Detect Tab key press
if (change.text === '\t' && changeStartLine >= previewStartLine) {
await acceptPreview(textEditor, event.document, startLine, textEditor.selection.active, completionText);
}
}
} finally {
isHandlingChange = false;
@ -232,8 +178,6 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
// Restore original content if Backspace is pressed (decline the preview)
const restoreOriginalContent = async () => {
if (!previewInserted) return;
@ -246,11 +190,13 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
textEditor.setDecorations(previewDecorationType, []);
previewInserted = false;
disposable.dispose(); // Cancel listener when preview is discarded
disposable.dispose();
};
// Accept the preview when Tab is pressed
// Modify the acceptPreview function to match the working version
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();
@ -264,16 +210,14 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
await vscode.workspace.applyEdit(edit);
await document.save();
disposable.dispose(); // Cancel listener when preview is accepted
disposable.dispose();
previewInserted = false;
console.log("Preview accepted");
};
// Call this function to initiate the preview
await storeAndInsertPreview();
} catch (err: any) {
vscode.window.showErrorMessage(
"Fabelous Autocoder encountered an error: " + err.message