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

step back

This commit is contained in:
Falko Victor Habel 2024-09-11 11:28:55 +02:00
parent fb6e9a5d1f
commit ac7afb4b4e
1 changed files with 51 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/extension.ts
View File

@ -59,10 +59,13 @@ const previewDecorationType = vscode.window.createTextEditorDecorationType({
rangeBehavior: vscode.DecorationRangeBehavior.ClosedOpen, // Ensure proper handling of multiline decorations rangeBehavior: vscode.DecorationRangeBehavior.ClosedOpen, // Ensure proper handling of multiline decorations
}); });
async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationToken?: vscode.CancellationToken) { async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationToken?: vscode.CancellationToken) {
const document = textEditor.document; const document = textEditor.document;
const position = textEditor.selection.active; const position = textEditor.selection.active;
// Get the context and create the FIM prompt
const context = getContextLines(document, position); const context = getContextLines(document, position);
const fimPrompt = createFIMPrompt(context, document.languageId); const fimPrompt = createFIMPrompt(context, document.languageId);
@ -86,6 +89,7 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
vscode.workspace.onDidCloseTextDocument(axiosCancelPost); vscode.workspace.onDidCloseTextDocument(axiosCancelPost);
}); });
// Make the API request
const response = await axios.post(apiEndpoint, { const response = await axios.post(apiEndpoint, {
model: apiModel, model: apiModel,
prompt: fimPrompt, prompt: fimPrompt,
@ -108,75 +112,68 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
let completionText = response.data.response; let completionText = response.data.response;
completionText = completionText.replace(/<fim_middle>|<fim_suffix>|<fim_prefix>/g, '').trim(); completionText = completionText.replace(/<fim_middle>|<fim_suffix>|<fim_prefix>/g, '').trim();
// Split the completion text by new lines
// Split the completion text by new lines // Split the completion text by new lines
const lines = completionText.split('\n'); const lines = completionText.split('\n');
// Create a decoration for each line of the response // Remove context lines and insert the preview
const previewRanges = lines.map((line: string, idx: number) => { const startLine = Math.max(0, position.line - 1); // Start 1 line before the cursor
// Determine the start position for each line const endLine = position.line + 1; // End 1 line after the cursor
const startPos = new vscode.Position(position.line + idx, 0); const rangeToReplace = new vscode.Range(
new vscode.Position(startLine, 0),
// Create a range that decorates the line, spanning from start to start (empty range) new vscode.Position(endLine, 0)
const range = new vscode.Range(startPos, startPos); );
// Apply grayed-out italic styling to the preview
const previewRanges = lines.map((line: string, index: number) => {
const linePos = new vscode.Position(startLine + index, 0);
return { return {
range, range: new vscode.Range(linePos, linePos),
renderOptions: { renderOptions: {
after: { before: {
contentText: line, // Display the current line contentText: line,
color: '#888888', color: '#888888', // Grayed-out text
fontStyle: 'italic', fontStyle: 'italic', // Italic text
} }
} }
}; };
}); });
// Apply the decorations for multiline preview const previewDecorationType = vscode.window.createTextEditorDecorationType({
color: '#888888', // Grayed-out color
fontStyle: 'italic', // Italic style
});
// Apply the preview as decoration
textEditor.setDecorations(previewDecorationType, previewRanges); textEditor.setDecorations(previewDecorationType, previewRanges);
// Flag to ensure we only accept or dismiss once
let previewInserted = true;
let completionInserted = false; // Flag to track insertion // Event handler to accept or dismiss the preview
const disposable = vscode.workspace.onDidChangeTextDocument(async (event) => { const disposable = vscode.workspace.onDidChangeTextDocument(async (event) => {
if (event.document.uri.toString() === document.uri.toString()) { if (event.document.uri.toString() === document.uri.toString()) {
const change = event.contentChanges[0]; const change = event.contentChanges[0];
// Handle Backspace to decline the preview // Handle Backspace to dismiss the preview
if (change && change.text === '' && change.rangeLength === 1) { if (change && change.text === '' && change.rangeLength === 1) {
textEditor.setDecorations(previewDecorationType, []); // Remove preview decorations // Remove the decoration preview
disposable.dispose(); textEditor.setDecorations(previewDecorationType, []);
disposable.dispose(); // Clean up event listener
previewInserted = false;
} }
// Handle Ctrl + Enter (or Cmd + Enter on macOS) to accept the preview // Handle Enter to accept the preview
const isCtrlOrCmdPressed = event.contentChanges.some( if (change && change.text === '\n' && previewInserted) {
(change) => { // Remove the decoration preview and insert actual completion text
const isMac = process.platform === 'darwin'; textEditor.setDecorations(previewDecorationType, []); // Remove decorations
const isCtrlOrCmd = isMac ? change.text.includes('\u0010') : change.text.includes('\n');
return isCtrlOrCmd;
}
);
if (isCtrlOrCmdPressed && !completionInserted) {
// Ensure that we insert the completion text only once
completionInserted = true;
// Remove the preview decoration before applying the final completion
textEditor.setDecorations(previewDecorationType, []);
const edit = new vscode.WorkspaceEdit(); const edit = new vscode.WorkspaceEdit();
const insertPosition = new vscode.Position(position.line, 0); const acceptedText = completionText;
edit.replace(document.uri, rangeToReplace, acceptedText); // Insert actual completion
await vscode.workspace.applyEdit(edit);
// Avoid duplicating the completion text disposable.dispose(); // Clean up event listener
if (!document.getText().includes(completionText)) { previewInserted = false;
edit.insert(document.uri, insertPosition, '\n' + completionText);
await vscode.workspace.applyEdit(edit);
}
const newPosition = new vscode.Position(position.line + lines.length, lines[lines.length - 1].length);
textEditor.selection = new vscode.Selection(newPosition, newPosition);
disposable.dispose(); // Clean up the listener after accepting the completion
} }
} }
}); });
@ -189,12 +186,9 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
} }
} }
); );
} }
async function provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, cancellationToken: vscode.CancellationToken) { 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.insertText = new vscode.SnippetString('${1:}');