Merge pull request DonJayamanne#28 from Himanoa/virtualenv

Added support for virtualenv

Author: DonJayamanne

src/client/common/configSettings.ts

@@ -1,6 +1,8 @@
 'use strict';
 
 import * as vscode from 'vscode';
+import * as path from 'path';
+import * as fs from 'fs';
 
 export interface IPythonSettings {
  pythonPath: string;
@@ -49,12 +51,23 @@ export class PythonSettings implements IPythonSettings {
 
  this.initializeSettings();
  }
-
+ private getVirtualenvPath() {
+ var currentPath: string = vscode.workspace.rootPath;
+ if (process.platform == 'win32') {
+ var bin: string = "Scripts";
+ var _path: string = path.join(currentPath, bin, "python.exe");
+ }
+ else {
+ var bin: string = "bin";
+ var _path: string = path.join(currentPath, bin, "python");
+ }
+ return fs.existsSync(_path)
+ ? _path
+ : this.pythonPath;
+ }
  private initializeSettings() {
  var pythonSettings = vscode.workspace.getConfiguration("python");
-
- this.pythonPath = pythonSettings.get<string>("pythonPath");
-
+ this.pythonPath = this.getVirtualenvPath()
  var lintingSettings = pythonSettings.get<ILintingSettings>("linting");
  if (this.linting) {
  Object.assign<ILintingSettings, ILintingSettings>(this.linting, lintingSettings);

src/client/package.json

@@ -144,6 +144,7 @@
  "dependencies": {
  "named-js-regexp": "^1.3.1",
  "tmp": "0.0.28",
+ "path": "0.12.7",
  "uint64be": "^1.0.1",
  "vscode-debugadapter": "^1.0.1",
  "vscode-debugprotocol": "^1.0.1",