Use byteoffset when calling gocode Fixes #1431

microsoft · Jan 2, 2018 · 4b588af · 4b588af
1 parent 265bbef
commit 4b588af
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Go-latest.vsix b/Go-latest.vsix
diff --git a/src/goMain.ts b/src/goMain.ts
@@ -56,7 +56,7 @@ export function activate(ctx: vscode.ExtensionContext): void {
 		  "data": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	   }
 	 */
-	// sendTelemetryEvent('beta-testing', { version: '0.6.70', date: '12/08/2017' });
+	sendTelemetryEvent('beta-testing', { version: '0.6.71', date: '01/01/2018' });
 
 	let useLangServer = vscode.workspace.getConfiguration('go')['useLanguageServer'];
 	let langServerFlags: string[] = vscode.workspace.getConfiguration('go')['languageServerFlags'] || [];

diff --git a/src/goSuggest.ts b/src/goSuggest.ts
@@ -7,7 +7,7 @@
 
 import vscode = require('vscode');
 import cp = require('child_process');
-import { getBinPath, parameters, parseFilePrelude, isPositionInString, goKeywords, getToolsEnvVars, guessPackageNameFromFile, goBuiltinTypes } from './util';
+import { getBinPath, parameters, parseFilePrelude, isPositionInString, goKeywords, getToolsEnvVars, guessPackageNameFromFile, goBuiltinTypes, byteOffsetAt } from './util';
 import { promptForMissingTool } from './goInstallTools';
 import { getTextEditForAddImport } from './goImport';
 import { getImportablePackages } from './goPackages';
@@ -71,7 +71,7 @@ export class GoCompletionItemProvider implements vscode.CompletionItemProvider {
 					return resolve([]);
 				}
 
-				let offset = document.offsetAt(position);
+				let offset = byteOffsetAt(document, position);
 				let inputText = document.getText();
 				let includeUnimportedPkgs = autocompleteUnimportedPackages && !inString;
 
@@ -128,7 +128,7 @@ export class GoCompletionItemProvider implements vscode.CompletionItemProvider {
 			let stderr = '';
 
 			// Spawn `gocode` process
-			let p = cp.spawn(gocode, ['-f=json', 'autocomplete', filename, 'c' + offset], { env });
+			let p = cp.spawn(gocode, ['-f=json', 'autocomplete', filename, '' + offset], { env });
 			p.stdout.on('data', data => stdout += data);
 			p.stderr.on('data', data => stderr += data);
 			p.on('error', err => {