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:4c5eb334dfd9955e1c937c15b45e39563f8c7bfc
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:6a953b7a126770f1229a87e4f6c78d62a37a3de1
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. "4c5eb334dfd9955e1c937c15b45e39563f8c7bfc" and "6a953b7a126770f1229a87e4f6c78d62a37a3de1" have entirely different histories.
4c5eb334df ... 6a953b7a12

2 changed files with 76 additions and 121 deletions
Show Stats Expand all files Collapse all files

7
package.json
View File

@ -1,6 +1,6 @@
{
"name": "fabelous-autocoder",
"version": "0.2.0",
"version": "0.2.74",
"displayName": "Fabelous Autocoder",
"description": "A simple to use Ollama autocompletion Plugin",
"icon": "icon.png",
@ -111,8 +111,9 @@
"commands": [
{
"command": "fabelous-autocoder.autocomplete",
"title": "Fabelous Autocompletion"
}]
"title": "Fabelous autocompletion"
}
]
},
"scripts": {
"vscode:prepublish": "npm run compile",

126
src/extension.ts
View File

@ -113,101 +113,59 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
let completionText = response.data.response;
completionText = completionText.replace(/<fim_middle>|<fim_suffix>|<fim_prefix>/g, '').trim();
let previewInserted = false;
let originalContent: string;
let previewStartLine: number;
const storeAndInsertPreview = async () => {
previewStartLine = startLine;
const endLine = document.lineCount - 1;
const endCharacter = document.lineAt(endLine).text.length;
const fullRange = new vscode.Range(startLine, 0, endLine, endCharacter);
originalContent = document.getText(fullRange);
// Split the completion text by new lines
const newLines = completionText.split('\n');
const previewContent = completionText + '\n'.repeat(1);
const edit = new vscode.WorkspaceEdit();
edit.replace(document.uri, fullRange, previewContent); // Overwrite the content
await vscode.workspace.applyEdit(edit);
// Calculate the number of new lines in the completion, plus 2 extra lines
const totalNewLines = newLines.length + 2;
// Split the preview content into lines
const previewLines = previewContent.split('\n');
// Calculate the exact position of the last character of the preview content
const lastPreviewLineIndex = previewStartLine + previewLines.length - 1;
const lastPreviewLine = previewLines[previewLines.length - 2]; // Second to last line (last line is newline)
const newPosition = new vscode.Position(lastPreviewLineIndex - 1, lastPreviewLine.length); // Place cursor at end of last line
// Set the new cursor position after inserting preview
textEditor.selection = new vscode.Selection(newPosition, newPosition);
// Explicitly scroll to reveal the cursor position at the end of the preview
textEditor.revealRange(new vscode.Range(newPosition, newPosition), vscode.TextEditorRevealType.InCenter);
// Set decorations on the newly inserted lines
// Create preview decorations and insert new lines
const previewRanges: vscode.DecorationOptions[] = [];
for (let i = 0; i < previewLines.length; i++) {
const range = new vscode.Range(previewStartLine + i, 0, previewStartLine + i, previewLines[i].length);
const edit = new vscode.WorkspaceEdit();
const document = textEditor.document;
for (let i = 0; i < totalNewLines; i++) {
const lineContent = i < newLines.length ? newLines[i] : '';
const position = new vscode.Position(startLine + i, 0);
// Insert a new line
edit.insert(document.uri, position, '\n');
// Create a range for the newly inserted line
const range = new vscode.Range(position, position.translate(1, 0));
previewRanges.push({
range,
renderOptions: {
after: {
contentText: previewLines[i],
contentText: lineContent,
}
}
});
}
textEditor.setDecorations(previewDecorationType, previewRanges);
previewInserted = true;
};
const disposable = vscode.workspace.onDidChangeTextDocument(async (event) => {
const textEditor = vscode.window.activeTextEditor;
if (!textEditor || event.document.uri.toString() !== textEditor.document.uri.toString() || !previewInserted) {
return;
}
// Determine tab size setting
const tabSize = textEditor.options.tabSize as number || 4;
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();
}
// Detect Tab by checking if the change is a multiple of spaces equal to the tab size
if (/^[ ]+$/.test(change.text) && change.text.length === tabSize && changeStartLine >= previewStartLine) {
await acceptPreview(textEditor, document, startLine, position, completionText);
}
}
});
const restoreOriginalContent = async () => {
if (!previewInserted) return;
const endLine = document.lineCount - 1;
const fullRange = new vscode.Range(previewStartLine, 0, endLine, document.lineAt(endLine).text.length);
const edit = new vscode.WorkspaceEdit();
edit.replace(document.uri, fullRange, originalContent);
// Apply the edit to insert new lines
await vscode.workspace.applyEdit(edit);
// Set decorations on the newly inserted lines
textEditor.setDecorations(previewDecorationType, previewRanges);
let previewInserted = true;
// Handle preview acceptance or dismissal
const disposable = vscode.workspace.onDidChangeTextDocument(async (event) => {
if (event.document.uri.toString() === document.uri.toString()) {
const change = event.contentChanges[0];
// Dismiss preview with Backspace
if (change && change.text === '' && change.rangeLength === 1) {
textEditor.setDecorations(previewDecorationType, []);
previewInserted = false;
disposable.dispose();
previewInserted = false;
}
// Move cursor back to the end of the original content
const lastOriginalLineNumber = previewStartLine + originalContent.split('\n').length - 1;
const lastLineLength = originalContent.split('\n').pop()?.length || 0;
const newPosition = new vscode.Position(lastOriginalLineNumber, lastLineLength);
textEditor.selection = new vscode.Selection(newPosition, newPosition);
};
// 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");
// Accept preview with Tab key
if (change && change.text === '\t' && previewInserted) {
textEditor.setDecorations(previewDecorationType, []);
const edit = new vscode.WorkspaceEdit();
@ -222,17 +180,14 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
await document.save(); // Optionally save after inserting
// Move the cursor to the end of the inserted completion
const totalNewLines = insertText.split('\n').length;
const newPosition = new vscode.Position(startLine + totalNewLines - 2, 0);
textEditor.selection = new vscode.Selection(newPosition, newPosition);
disposable.dispose();
previewInserted = false;
console.log("Preview accepted");
};
// Call this function to initiate the preview
await storeAndInsertPreview();
}
}
});
} catch (err: any) {
vscode.window.showErrorMessage(
@ -241,11 +196,10 @@ async function autocompleteCommand(textEditor: vscode.TextEditor, cancellationTo
console.log(err);
}
}
);
);
}
async function provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, cancellationToken: vscode.CancellationToken) {
const item = new vscode.CompletionItem("Fabelous autocompletion");
item.insertText = new vscode.SnippetString('${1:}');