fix #569

Author: DonJayamanne

package.json

@@ -854,6 +854,11 @@
 "default": "python",
 "description": "Path to Python, you can use a custom version of Python by modifying this setting to include the full path."
 },
+"python.venvPath": {
+"type": "string",
+"default": "",
+"description": "Path to folder with a list of Virtual Environments (e.g. ~/.pyenv, ~/Envs, ~/.virtualenvs)."
+},
 "python.envFile": {
 "type": "string",
 "description": "Absolute path to a file containing environment variable definitions.",

src/client/common/configSettings.ts

@@ -10,6 +10,7 @@ export const IS_WINDOWS = /^win/.test(process.platform);
 
 export interface IPythonSettings {
  pythonPath: string;
+ venvPath: string;
  jediPath: string;
  devOptions: string[];
  linting: ILintingSettings;
@@ -134,6 +135,7 @@ export class PythonSettings extends EventEmitter implements IPythonSettings {
  let pythonSettings = vscode.workspace.getConfiguration('python');
  this.pythonPath = systemVariables.resolveAny(pythonSettings.get<string>('pythonPath'));
  this.pythonPath = getAbsolutePath(this.pythonPath, IS_TEST_EXECUTION ? __dirname : workspaceRoot);
+ this.venvPath = systemVariables.resolveAny(pythonSettings.get<string>('venvPath'));
  this.jediPath = systemVariables.resolveAny(pythonSettings.get<string>('jediPath'));
  if (typeof this.jediPath === 'string' && this.jediPath.length > 0) {
  this.jediPath = getAbsolutePath(this.jediPath, IS_TEST_EXECUTION ? __dirname : workspaceRoot);
@@ -308,6 +310,7 @@ export class PythonSettings extends EventEmitter implements IPythonSettings {
  }
  public jediPath: string;
  public envFile: string;
+ public venvPath: string;
  public devOptions: string[];
  public linting: ILintingSettings;
  public formatting: IFormattingSettings;

src/client/providers/setInterpreterProvider.ts

@@ -29,10 +29,13 @@ function getSearchPaths(): Promise<string[]> {
  localAppData, appData,
  process.env['SystemDrive']];
  if (appData) {
- lookupParentDirectories.push(path.join(localAppData, 'Programs'))
+ lookupParentDirectories.push(path.join(localAppData, 'Programs'));
  }
  if (localAppData) {
- lookupParentDirectories.push(path.join(appData, 'Programs'))
+ lookupParentDirectories.push(path.join(appData, 'Programs'));
+ }
+ if (settings.PythonSettings.getInstance().venvPath) {
+ lookupParentDirectories.push(settings.PythonSettings.getInstance().venvPath);
  }
  const dirPromises = lookupParentDirectories.map(rootDir => {
  if (!rootDir) {
@@ -64,12 +67,15 @@ function getSearchPaths(): Promise<string[]> {
  return validPathsCollection.reduce((previousValue, currentValue) => previousValue.concat(currentValue), []);
  });
  } else {
- const paths = ['/usr/local/bin', '/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/sbin'];
+ const paths = ['/usr/local/bin', '/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/sbin', '/Envs', '/.virtualenvs', '/.pyenv'];
  // Add support for paths such as /Users/xxx/anaconda/bin
  if (process.env['HOME']) {
  paths.push(path.join(process.env['HOME'], 'anaconda', 'bin'));
  paths.push(path.join(process.env['HOME'], 'python', 'bin'));
  }
+ if (settings.PythonSettings.getInstance().venvPath) {
+ paths.push(settings.PythonSettings.getInstance().venvPath);
+ }
  return Promise.resolve(paths);
  }
 }
@@ -241,7 +247,7 @@ function presentQuickPickOfSuggestedPythonPaths() {
 }
 
 function setInterpreter() {
- if (typeof vscode.workspace.rootPath !== 'string'){
+ if (typeof vscode.workspace.rootPath !== 'string') {
  return vscode.window.showErrorMessage('Please open a workspace to select the Python Interpreter');
  }
  presentQuickPickOfSuggestedPythonPaths();