Corner cases for add pkg to workspace cmd

CHANGELOG.md

@@ -20,7 +20,7 @@
     * Fix error with `Go: Generate Interface Stubs` command when using on an interface that is defined inside an "internal" folder.[Bug 1769](https://github.com/Microsoft/vscode-go/issues/1769)
     * Fix bug where auto-completions dont show built-in types. [Bug 1739](https://github.com/Microsoft/vscode-go/issues/1739)
     * Look at GOROOT before PATH when looking for the Go binary. Fixes [Bug 1760](https://github.com/Microsoft/vscode-go/issues/1760) which was a regression.
-    * Clean up the debug binary that gets generated by delve at the end of the debugging session. Fix works in Windows only at the moment, waiting for upstream fixes to make it work in other platforms.
+    * Clean up the debug binary that gets generated by delve at the end of the debugging session. [Bug 1345](https://github.com/Microsoft/vscode-go/issues/1345)
 
 ## 0.6.84 - 29th June, 2018
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Go",
-  "version": "0.6.85-beta.7",
+  "version": "0.6.85-beta.8",
   "publisher": "ms-vscode",
   "description": "Rich Go language support for Visual Studio Code",
   "author": {

src/goImport.ts

@@ -112,14 +112,16 @@ export function addImportToWorkspace() {
 
 	let importPath = '';
 	if (!selection.isEmpty) {
-		// Attempt to load a partial import path based on currently selected text
 		let selectedText = editor.document.getText(selection).trim();
 		if (selectedText.length > 0) {
-			if (!selectedText.startsWith('"')) {
-				selectedText = '"' + selectedText;
-			}
-			if (!selectedText.endsWith('"')) {
-				selectedText = selectedText + '"';
+			if (selectedText.indexOf(' ') === -1) {
+				// Attempt to load a partial import path based on currently selected text
+				if (!selectedText.startsWith('"')) {
+					selectedText = '"' + selectedText;
+				}
+				if (!selectedText.endsWith('"')) {
+					selectedText = selectedText + '"';
+				}
 			}
 			importPath = getImportPath(selectedText);
 		}
@@ -140,12 +142,9 @@ export function addImportToWorkspace() {
 	const env = getToolsEnvVars();
 
 	cp.execFile(goRuntimePath, ['list', '-f', '{{.Dir}}', importPath], { env }, (err, stdout, stderr) => {
-		if (!stdout) {
-			return;
-		}
-
-		let dirs = stdout.split('\n');
-		if (dirs.length === 0) {
+		let dirs = (stdout || '').split('\n');
+		if (!dirs.length || !dirs[0].trim()) {
+			vscode.window.showErrorMessage(`Could not find package ${importPath}`);
 			return;
 		}