swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix off-by-one error for utf8 to utf16 pos conversion

Browse Source
This commit is contained in:
Lej77 committed 2023-04-06 05:22:14 +02:00
1 parent bc29cf4d28
commit d1d0ffd912
1 file changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files
extension/src/main.ts
+7 -6
View File
@@ -169,7 +169,7 @@ function fmtDocument(document: vscode.TextDocument) {
if (result.length === 0) return; if (result.length === 0) return;
let decoded: RsxEdit[] = JSON.parse(result); const decoded: RsxEdit[] = JSON.parse(result);
if (decoded.length === 0) return; if (decoded.length === 0) return;
// Preform edits at the end of the file // Preform edits at the end of the file
@@ -182,16 +182,15 @@ function fmtDocument(document: vscode.TextDocument) {
const utf8Text = new TextEncoder().encode(text); const utf8Text = new TextEncoder().encode(text);
const utf8ToUtf16Pos = (posUtf8: number) => { const utf8ToUtf16Pos = (posUtf8: number) => {
const beforeTarget = utf8Text.slice(0, posUtf8 - 1);
// Find the line of the position as well as the utf8 and // Find the line of the position as well as the utf8 and
// utf16 indexes for the start of that line: // utf16 indexes for the start of that line:
let startOfLineUtf8 = 0; let startOfLineUtf8 = 0;
let lineIndex = 0; let lineIndex = 0;
const newLineUtf8 = '\n'.charCodeAt(0); const newLineUtf8 = '\n'.charCodeAt(0);
// eslint-disable-next-line no-constant-condition
while (true) { while (true) {
const nextLineAt = beforeTarget.indexOf(newLineUtf8, startOfLineUtf8); const nextLineAt = utf8Text.indexOf(newLineUtf8, startOfLineUtf8);
if (nextLineAt < 0) break; if (nextLineAt < 0 || posUtf8 <= nextLineAt) break;
startOfLineUtf8 = nextLineAt + 1; startOfLineUtf8 = nextLineAt + 1;
lineIndex++; lineIndex++;
} }
@@ -212,6 +211,7 @@ function fmtDocument(document: vscode.TextDocument) {
return currentUtf16; return currentUtf16;
}; };
type FixedEdit = { type FixedEdit = {
range: vscode.Range, range: vscode.Range,
formatted: string, formatted: string,
@@ -237,13 +237,14 @@ function fmtDocument(document: vscode.TextDocument) {
}); });
} }
// Apply edits: // Apply edits:
editor.edit(editBuilder => { editor.edit(editBuilder => {
edits.forEach((edit) => editBuilder.replace(edit.range, edit.formatted)); edits.forEach((edit) => editBuilder.replace(edit.range, edit.formatted));
}, { }, {
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}`);
} }