fix #500

Author: DonJayamanne

package.json

@@ -499,6 +499,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.jediPath": {
+          "type": "string",
+          "default": "",
+          "description": "Path to directory containing the Jedi library (this path will contain the 'Jedi' sub directory)."
+        },
         "python.sortImports.args": {
           "type": "array",
           "description": "Arguments passed in. Each argument is a separate item in the array.",

pythonFiles/completion.py

@@ -408,17 +408,21 @@ def watch(self):
 
 if __name__ == '__main__':
     jediPreview = False
+    cachePrefix = 'v'
     if len(sys.argv) > 0 and sys.argv[1] == 'preview':
         jediPath = os.path.join(os.path.dirname(__file__), 'preview', 'jedi')
         jediPreview = True
+    elif len(sys.argv) > 0 and sys.argv[1] == 'custom':
+        jediPath = sys.argv[2]
+        jediPreview = True
+        cachePrefix = 'custom_v'
     else:
         jediPath = os.path.join(os.path.dirname(__file__), 'release')
-
     sys.path.insert(0, jediPath)
-    import jedi
+    import jedi    
     if jediPreview:
         jedi.settings.cache_directory = os.path.join(
-            jedi.settings.cache_directory, 'v' + jedi.__version__.replace('.', ''))
+            jedi.settings.cache_directory, cachePrefix + jedi.__version__.replace('.', ''))
     # remove jedi from path after we import it so it will not be completed
     sys.path.pop(0)
     JediCompletion().watch()

src/client/common/configSettings.ts

@@ -7,6 +7,7 @@ import * as path from 'path';
 
 export interface IPythonSettings {
     pythonPath: string;
+    jediPath: string;
     devOptions: string[];
     linting: ILintingSettings;
     formatting: IFormattingSettings;
@@ -115,6 +116,13 @@ 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.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);
+        }
+        else {
+            this.jediPath = '';
+        }
         this.devOptions = systemVariables.resolveAny(pythonSettings.get<any[]>('devOptions'));
         this.devOptions = Array.isArray(this.devOptions) ? this.devOptions : [];
         let lintingSettings = systemVariables.resolveAny(pythonSettings.get<ILintingSettings>('linting'));
@@ -203,7 +211,7 @@ export class PythonSettings extends EventEmitter implements IPythonSettings {
 
         // Support for travis
         this.unitTest = this.unitTest ? this.unitTest : {
-            promptToConfigure:true,
+            promptToConfigure: true,
             nosetestArgs: [], nosetestPath: 'nosetest', nosetestsEnabled: false,
             outputWindow: 'python',
             pyTestArgs: [], pyTestEnabled: false, pyTestPath: 'pytest',
@@ -241,6 +249,7 @@ export class PythonSettings extends EventEmitter implements IPythonSettings {
     }
 
     public pythonPath: string;
+    public jediPath: string;
     public devOptions: string[];
     public linting: ILintingSettings;
     public formatting: IFormattingSettings;

src/client/providers/jediProxy.ts

@@ -192,14 +192,20 @@ function spawnProcess(dir: string) {
 
         logger.log('child_process.spawn in jediProxy', 'Value of pythonSettings.pythonPath is :' + pythonSettings.pythonPath);
         const args = ["completion.py"];
-        if (Array.isArray(pythonSettings.devOptions) &&
-            pythonSettings.devOptions.some(item => item.toUpperCase().trim() === 'USERELEASEAUTOCOMP')) {
-            // Use standard version of jedi library
-            args.push('std');
+        if (typeof pythonSettings.jediPath !== 'string' || pythonSettings.jediPath.length === 0) {
+            if (Array.isArray(pythonSettings.devOptions) &&
+                pythonSettings.devOptions.some(item => item.toUpperCase().trim() === 'USERELEASEAUTOCOMP')) {
+                // Use standard version of jedi library
+                args.push('std');
+            }
+            else {
+                // Use preview version of jedi library
+                args.push('preview');
+            }
         }
         else {
-            // Use preview version of jedi library
-            args.push('preview');
+            args.push('custom');
+            args.push(pythonSettings.jediPath);
         }
         proc = child_process.spawn(pythonSettings.pythonPath, args, {
             cwd: dir,