Fix: convert fillstruct's output to character offset (microsoft#2611)

zeynepotu · Apr 19, 2020 · 6c737b3 · 6c737b3
1 parent 7d50d75
commit 6c737b3
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/goFillStruct.ts b/src/goFillStruct.ts
@@ -8,7 +8,7 @@
 import cp = require('child_process');
 import vscode = require('vscode');
 import { promptForMissingTool } from './goInstallTools';
-import { byteOffsetAt, getBinPath, getFileArchive, getToolsEnvVars } from './util';
+import { byteOffsetAt, getBinPath, getFileArchive, getToolsEnvVars, makeMemoizedByteOffsetConverter } from './util';
 
 // Interface for the output from fillstruct
 interface GoFillStructOutput {
@@ -78,14 +78,15 @@ function execFillStruct(editor: vscode.TextEditor, args: string[]): Promise<void
 				}
 
 				const indent = '\t'.repeat(tabsCount);
+				const offsetConverter = makeMemoizedByteOffsetConverter(Buffer.from(editor.document.getText()));
 
 				editor
 					.edit((editBuilder) => {
 						output.forEach((structToFill) => {
 							const out = structToFill.code.replace(/\n/g, '\n' + indent);
 							const rangeToReplace = new vscode.Range(
-								editor.document.positionAt(structToFill.start),
-								editor.document.positionAt(structToFill.end)
+								editor.document.positionAt(offsetConverter(structToFill.start)),
+								editor.document.positionAt(offsetConverter(structToFill.end))
 							);
 							editBuilder.replace(rangeToReplace, out);
 						});