fix #832

DonJayamanne · DonJayamanne · commit f1c04a261e00 · 2017-08-09T22:17:41.000+10:00
diff --git a/src/client/common/envFileParser.ts b/src/client/common/envFileParser.ts
@@ -1,4 +1,5 @@
 import * as fs from 'fs';
+import * as path from 'path';
 
 export function parseEnvFile(envFile: string): any {
     const buffer = fs.readFileSync(envFile, 'utf8');
@@ -18,6 +19,19 @@ export function parseEnvFile(envFile: string): any {
 
 export function mergeEnvVariables(newVariables: { [key: string]: string }, mergeWith: any = process.env): any {
     for (let setting in mergeWith) {
+        if (setting === 'PYTHONPATH') {
+            let PYTHONPATH: string = newVariables['PYTHONPATH'];
+            if (typeof PYTHONPATH !== 'string') {
+                PYTHONPATH = '';
+            }
+            if (mergeWith['PYTHONPATH']) {
+                PYTHONPATH += (PYTHONPATH.length > 0 ? + path.delimiter : '') + mergeWith['PYTHONPATH'];
+            }
+            if (PYTHONPATH.length > 0) {
+                newVariables[setting] = PYTHONPATH;
+            }
+            continue;
+        }
         if (!newVariables[setting]) {
             newVariables[setting] = mergeWith[setting];
         }
diff --git a/src/client/providers/jediProxy.ts b/src/client/providers/jediProxy.ts
@@ -518,9 +518,20 @@ function onConfigChanged() {
         getPathFromPythonCommand(["-m", "site", "--user-site"]),
     ];
 
-    const pythonPath: string = process.env['PYTHONPATH'];
-    if (typeof pythonPath === 'string' && pythonPath.length > 0) {
-        filePaths.push(Promise.resolve(pythonPath.trim()));
+    let PYTHONPATH: string = process.env['PYTHONPATH'];
+    if (typeof PYTHONPATH !== 'string') {
+        PYTHONPATH = '';
+    }
+    let customEnvironmentVars = getCustomEnvVars();
+    if (customEnvironmentVars && customEnvironmentVars['PYTHONPATH']) {
+        let PYTHONPATHFromEnvFile = customEnvironmentVars['PYTHONPATH'] as string;
+        if (!path.isAbsolute(PYTHONPATHFromEnvFile) && typeof vscode.workspace.rootPath === 'string') {
+            PYTHONPATHFromEnvFile = path.resolve(vscode.workspace.rootPath, PYTHONPATHFromEnvFile);
+        }
+        PYTHONPATH += (PYTHONPATH.length > 0 ? + path.delimiter : '') + PYTHONPATHFromEnvFile;
+    }
+    if (typeof PYTHONPATH === 'string' && PYTHONPATH.length > 0) {
+        filePaths.push(Promise.resolve(PYTHONPATH.trim()));
     }
     Promise.all<string>(filePaths).then(paths => {
         // Last item return a path, we need only the folder
