Infer gopath correctly when no folder is opened

microsoft · Jan 22, 2019 · 58817b8 · 58817b8
1 parent b44bb8a
commit 58817b8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/util.ts b/src/util.ts
@@ -417,9 +417,11 @@ export function substituteEnv(input: string): string {
 
 export function getCurrentGoPath(workspaceUri?: vscode.Uri): string {
  let currentFilePath: string;
- if (vscode.window.activeTextEditor && vscode.workspace.getWorkspaceFolder(vscode.window.activeTextEditor.document.uri)) {
- workspaceUri = workspaceUri || vscode.workspace.getWorkspaceFolder(vscode.window.activeTextEditor.document.uri).uri;
+ if (vscode.window.activeTextEditor) {
  currentFilePath = vscode.window.activeTextEditor.document.uri.fsPath;
+ if (!workspaceUri && vscode.workspace.getWorkspaceFolder(vscode.window.activeTextEditor.document.uri)) {
+ workspaceUri = vscode.workspace.getWorkspaceFolder(vscode.window.activeTextEditor.document.uri).uri;
+ }
  }
  const config = vscode.workspace.getConfiguration('go', workspaceUri);
  let currentRoot = workspaceUri ? workspaceUri.fsPath : vscode.workspace.rootPath;