fix: vscode extension autofmt
This commit is contained in:
1 parent
8cf6f60e93
commit
9d7aeb398b
1 file changed
+7
-7
@@ -136,28 +136,26 @@ function fmtDocument(document: vscode.TextDocument) {
|
|||||||
const [editor,] = vscode.window.visibleTextEditors.filter(editor => editor.document.fileName === document.fileName);
|
const [editor,] = vscode.window.visibleTextEditors.filter(editor => editor.document.fileName === document.fileName);
|
||||||
if (!editor) return; // Need an editor to apply text edits.
|
if (!editor) return; // Need an editor to apply text edits.
|
||||||
|
|
||||||
const text = document.getText();
|
|
||||||
const fileDir = document.fileName.slice(0, document.fileName.lastIndexOf('\\'));
|
const fileDir = document.fileName.slice(0, document.fileName.lastIndexOf('\\'));
|
||||||
|
const child_proc = spawn(serverPath, ["fmt", "--file", document.fileName], {
|
||||||
const child_proc = spawn(serverPath, ["fmt", "--file", text], {
|
|
||||||
cwd: fileDir ? fileDir : undefined,
|
cwd: fileDir ? fileDir : undefined,
|
||||||
});
|
});
|
||||||
|
|
||||||
let result = '';
|
let result = '';
|
||||||
child_proc.stdout?.on('data', data => result += data);
|
child_proc.stdout?.on('data', data => result += data);
|
||||||
|
|
||||||
type RsxEdit = {
|
/*type RsxEdit = {
|
||||||
formatted: string,
|
formatted: string,
|
||||||
start: number,
|
start: number,
|
||||||
end: number
|
end: number
|
||||||
}
|
}*/
|
||||||
|
|
||||||
child_proc.on('close', () => {
|
child_proc.on('close', () => {
|
||||||
if (child_proc.exitCode !== 0) {
|
if (child_proc.exitCode !== 0) {
|
||||||
vscode.window.showWarningMessage(`Errors occurred while formatting. Make sure you have the most recent Dioxus-CLI installed!\nDioxus-CLI exited with exit code ${child_proc.exitCode}\n\nData from Dioxus-CLI:\n${result}`);
|
vscode.window.showWarningMessage(`Errors occurred while formatting. Make sure you have the most recent Dioxus-CLI installed!\nDioxus-CLI exited with exit code ${child_proc.exitCode}\n\nData from Dioxus-CLI:\n${result}`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (result.length === 0) return;
|
/*if (result.length === 0) return;
|
||||||
|
|
||||||
// Used for error message:
|
// Used for error message:
|
||||||
const originalResult = result;
|
const originalResult = result;
|
||||||
@@ -245,9 +243,10 @@ function fmtDocument(document: vscode.TextDocument) {
|
|||||||
undoStopAfter: false,
|
undoStopAfter: false,
|
||||||
undoStopBefore: false
|
undoStopBefore: false
|
||||||
});
|
});
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
vscode.window.showWarningMessage(`Errors occurred while formatting. Make sure you have the most recent Dioxus-CLI installed!\n${err}\n\nData from Dioxus-CLI:\n${originalResult}`);
|
vscode.window.showWarningMessage(`Errors occurred while formatting. Make sure you have the most recent Dioxus-CLI installed!\n${err}\n\nData from Dioxus-CLI:\n${originalResult}`);
|
||||||
}
|
}*/
|
||||||
});
|
});
|
||||||
|
|
||||||
child_proc.on('error', (err) => {
|
child_proc.on('error', (err) => {
|
||||||
@@ -259,6 +258,7 @@ function fmtDocument(document: vscode.TextDocument) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// I'm using the approach defined in rust-analyzer here
|
// I'm using the approach defined in rust-analyzer here
|
||||||
//
|
//
|
||||||
// We ship the server as part of the extension, but we need to handle external paths and such
|
// We ship the server as part of the extension, but we need to handle external paths and such
|
||||||
|
|||||||
Reference in new issue
Block a user