Add Import to Workspace

package.json

@@ -154,6 +154,11 @@
         "title": "Go: Add Import",
         "description": "Add an import declaration"
       },
+      {
+        "command": "go.add.package.workspace",
+        "title": "Go: Add Package to Workspace",
+        "description": "Add a package from the imports list to the workspace."
+      },
       {
         "command": "go.tools.install",
         "title": "Go: Install/Update Tools",

src/goImport.ts

@@ -6,7 +6,8 @@
 'use strict';
 
 import vscode = require('vscode');
-import { parseFilePrelude } from './util';
+import cp = require('child_process');
+import { parseFilePrelude, getImportPath, getBinPath, getToolsEnvVars } from './util';
 import { documentSymbols } from './goOutline';
 import { promptForMissingTool } from './goInstallTools';
 import { getImportablePackages } from './goPackages';
@@ -104,3 +105,58 @@ export function addImport(arg: string) {
 		}
 	});
 }
+
+export function addImportToWorkspace() {
+	const editor = vscode.window.activeTextEditor;
+	const selection = editor.selection;
+
+	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 + '"';
+			}
+			importPath = getImportPath(selectedText);
+		}
+	}
+
+	if (importPath === '') {
+		// Failing that use the current line
+		let selectedText = editor.document.lineAt(selection.active.line).text;
+		importPath = getImportPath(selectedText);
+	}
+
+	if (importPath === '') {
+		vscode.window.showErrorMessage('No import path to add');
+		return;
+	}
+
+	const goRuntimePath = getBinPath('go');
+	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) {
+			return;
+		}
+
+		const importPathUri = vscode.Uri.file(dirs[0]);
+
+		const existingWorkspaceFolder = vscode.workspace.getWorkspaceFolder(importPathUri);
+		if (existingWorkspaceFolder !== undefined) {
+			vscode.window.showInformationMessage('Already available under ' + existingWorkspaceFolder.name);
+			return;
+		}
+
+		vscode.workspace.updateWorkspaceFolders(vscode.workspace.workspaceFolders ? vscode.workspace.workspaceFolders.length : 0, null, { uri: importPathUri });
+	});
+}

src/goMain.ts

@@ -27,7 +27,7 @@ import { initGoCover } from './goCover';
 import { testAtCursor, testCurrentPackage, testCurrentFile, testPrevious, testWorkspace } from './goTest';
 import { showTestOutput, cancelRunningTests } from './testUtils';
 import * as goGenerateTests from './goGenerateTests';
-import { addImport } from './goImport';
+import { addImport, addImportToWorkspace } from './goImport';
 import { installAllTools, checkLanguageServer } from './goInstallTools';
 import { isGoPathSet, getBinPath, sendTelemetryEvent, getExtensionCommands, getGoVersion, getCurrentGoPath, getToolsGopath, handleDiagnosticErrors, disposeTelemetryReporter, getToolsEnvVars } from './util';
 import { LanguageClient, RevealOutputChannelOn, FormattingOptions, ProvideDocumentFormattingEditsSignature, ProvideCompletionItemsSignature } from 'vscode-languageclient';
@@ -274,6 +274,10 @@ export function activate(ctx: vscode.ExtensionContext): void {
 		return addImport(typeof arg === 'string' ? arg : null);
 	}));
 
+	ctx.subscriptions.push(vscode.commands.registerCommand('go.add.package.workspace', () => {
+		addImportToWorkspace();
+	}));
+
 	ctx.subscriptions.push(vscode.commands.registerCommand('go.tools.install', () => {
 		installAllTools();
 	}));

src/util.ts

@@ -811,4 +811,5 @@ export function makeMemoizedByteOffsetConverter(buffer: Buffer): (byteOffset: nu
 		memo.insert(byteOffset, nearest.value + charDelta);
 		return nearest.value + charDelta;
 	};
-}
+}
+