Improved interpreter switching (DonJayamanne#1263)

Kavakuo · DonJayamanne · commit 9c7a8e3fe65d · 2017-10-03T09:49:52.000-07:00
Switching the interpreter is possible if no workspace is opened
diff --git a/package.json b/package.json
@@ -117,7 +117,7 @@
       },
       {
         "command": "python.setInterpreter",
-        "title": "Select Workspace Interpreter",
+        "title": "Select Interpreter",
         "category": "Python"
       },
       {
diff --git a/src/client/interpreter/index.ts b/src/client/interpreter/index.ts
@@ -58,7 +58,11 @@ export class InterpreterManager implements Disposable {
             pythonPath = path.join('${workspaceRoot}', path.relative(workspace.rootPath!, pythonPath));
         }
         const pythonConfig = workspace.getConfiguration('python');
-        pythonConfig.update('pythonPath', pythonPath).then(() => {
+        let global = null;
+        if (typeof workspace.rootPath !== 'string') {
+            global = true;
+        }
+        pythonConfig.update('pythonPath', pythonPath, global).then(() => {
             //Done
         }, reason => {
             window.showErrorMessage(`Failed to set 'pythonPath'. Error: ${reason.message}`);
diff --git a/src/client/providers/setInterpreterProvider.ts b/src/client/providers/setInterpreterProvider.ts
@@ -58,9 +58,6 @@ export class SetInterpreterProvider implements vscode.Disposable {
     }
 
     private setInterpreter() {
-        if (typeof vscode.workspace.rootPath !== 'string') {
-            return vscode.window.showErrorMessage('Please open a workspace to select the Python Interpreter');
-        }
         this.presentQuickPick();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@`
`117`	`117`	`},`
`118`	`118`	`{`
`119`	`119`	`"command": "python.setInterpreter",`
`120`		`- "title": "Select Workspace Interpreter",`
	`120`	`+ "title": "Select Interpreter",`
`121`	`121`	`"category": "Python"`
`122`	`122`	`},`
`123`	`123`	`{`
Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,6 @@ export class SetInterpreterProvider implements vscode.Disposable {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`private setInterpreter() {`
`61`		`- if (typeof vscode.workspace.rootPath !== 'string') {`
`62`		`- return vscode.window.showErrorMessage('Please open a workspace to select the Python Interpreter');`
`63`		`- }`
`64`	`61`	`this.presentQuickPick();`
`65`	`62`	`}`
`66`	`63`	`}`