Use additionalTextEdits so that 'useCodeSnippetsOnFunctionSuggest' fe…

…ature continues to work

src/goImport.ts

@@ -31,36 +31,37 @@ function askUserForImport(): Thenable<string> {
 	});
 }
 
+export function getTextEditForAddImport(arg: string): vscode.TextEdit {
+	// Import name wasn't provided
+	if (arg === undefined) {
+		return null;
+	}
+
+	let {imports, pkg} = parseFilePrelude(vscode.window.activeTextEditor.document.getText());
+	let multis = imports.filter(x => x.kind === 'multi');
+	if (multis.length > 0) {
+		// There is a multiple import declaration, add to the last one
+		let closeParenLine = multis[multis.length - 1].end;
+		return vscode.TextEdit.insert(new vscode.Position(closeParenLine, 0), '\t"' + arg + '"\n');
+	} else if (imports.length > 0) {
+		// There are only single import declarations, add after the last one
+		let lastSingleImport = imports[imports.length - 1].end;
+		return vscode.TextEdit.insert(new vscode.Position(lastSingleImport + 1, 0), 'import "' + arg + '"\n');
+	} else if (pkg && pkg.start >= 0) {
+		// There are no import declarations, but there is a package declaration
+		return vscode.TextEdit.insert(new vscode.Position(pkg.start + 1, 0), '\nimport (\n\t"' + arg + '"\n)\n');
+	} else {
+		// There are no imports and no package declaration - give up
+		return null;
+	}
+}
+
 export function addImport(arg: string) {
 	let p = arg ? Promise.resolve(arg) : askUserForImport();
 	p.then(imp => {
-		// Import name wasn't provided
-		if (imp === undefined) {
-			return null;
-		}
-
-		let {imports, pkg} = parseFilePrelude(vscode.window.activeTextEditor.document.getText());
-		let multis = imports.filter(x => x.kind === 'multi');
-		if (multis.length > 0) {
-			// There is a multiple import declaration, add to the last one
-			let closeParenLine = multis[multis.length - 1].end;
-			return vscode.window.activeTextEditor.edit(editBuilder => {
-				editBuilder.insert(new vscode.Position(closeParenLine, 0), '\t"' + imp + '"\n');
-			});
-		} else if (imports.length > 0) {
-			// There are only single import declarations, add after the last one
-			let lastSingleImport = imports[imports.length - 1].end;
-			return vscode.window.activeTextEditor.edit(editBuilder => {
-				editBuilder.insert(new vscode.Position(lastSingleImport + 1, 0), 'import "' + imp + '"\n');
-			});
-		} else if (pkg && pkg.start >= 0) {
-			// There are no import declarations, but there is a package declaration
-			return vscode.window.activeTextEditor.edit(editBuilder => {
-				editBuilder.insert(new vscode.Position(pkg.start + 1, 0), '\nimport (\n\t"' + imp + '"\n)\n');
-			});
-		} else {
-			// There are no imports and no package declaration - give up
-			return null;
-		}
+		let edit = getTextEditForAddImport(imp);
+		vscode.window.activeTextEditor.edit(editBuilder => {
+			editBuilder.insert(edit.range.start, edit.newText);
+		});
 	});
-}
+}

src/goSuggest.ts

@@ -11,7 +11,7 @@ import { dirname, basename } from 'path';
 import { getBinPath } from './goPath';
 import { parameters, parseFilePrelude } from './util';
 import { promptForMissingTool } from './goInstallTools';
-import { listPackages } from './goImport';
+import { listPackages, getTextEditForAddImport } from './goImport';
 
 function vscodeKindFromGoCodeClass(kind: string): vscode.CompletionItemKind {
 	switch (kind) {
@@ -96,13 +96,10 @@ export class GoCompletionItemProvider implements vscode.CompletionItemProvider {
 							// Now that we have the package imported in the inputText, run gocode again
 							return this.runGoCode(filename, inputText, offset, inString, position, lineText).then(newsuggestions => {
 								// Since the new suggestions are due to the package that we imported,
-								// add a command to do the same in the actual document in the editor
+								// add additionalTextEdits to do the same in the actual document in the editor
+								// We use additionalTextEdits instead of command so that 'useCodeSnippetsOnFunctionSuggest' feature continues to work
 								newsuggestions.forEach(item => {
-									item.command = {
-										title: 'Import Package',
-										command: 'go.import.add',
-										arguments: [pkgPath]
-									};
+									item.additionalTextEdits = [getTextEditForAddImport(pkgPath)];
 								});
 								resolve(newsuggestions);
 							});