Skip to content

Commit ea25868

Browse files
committed
use dev branch of jedi
1 parent 8d02364 commit ea25868

60 files changed

Lines changed: 32 additions & 8 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitmodules

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
[submodule "docs"]
22
path = docs
33
url = https://github.com/DonJayamanne/pythonVSCodeDocs.git
4-
branch = help
4+
branch = help
5+
[submodule "pythonFiles/preview/jedi"]
6+
path = pythonFiles/preview/jedi
7+
url = https://github.com/davidhalter/jedi.git

pythonFiles/completion.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
import sys
55
import json
66
import traceback
7-
sys.path.append(os.path.dirname(__file__))
8-
import jedi
9-
# remove jedi from path after we import it so it will not be completed
10-
sys.path.pop(0)
117

128
WORD_RE = re.compile(r'\w')
139

@@ -339,4 +335,18 @@ def watch(self):
339335
sys.stderr.flush()
340336

341337
if __name__ == '__main__':
338+
jediPreview = False
339+
if len(sys.argv) > 1 and sys.argv[1] == 'preview':
340+
jediPath = os.path.join(os.path.dirname(__file__), 'preview', 'jedi')
341+
jediPreview = False
342+
else:
343+
jediPath = os.path.join(os.path.dirname(__file__), 'release')
344+
345+
sys.path.append(jediPath)
346+
import jedi
347+
if jediPreview:
348+
jedi.settings.cache_directory = os.path.join(jedi.settings.cache_directory, 'v' + jedi.__version__.replace('.', ''))
349+
350+
# remove jedi from path after we import it so it will not be completed
351+
sys.path.pop(0)
342352
JediCompletion().watch()

pythonFiles/jedi/.DS_Store

-6 KB
Binary file not shown.

pythonFiles/preview/jedi

Submodule jedi added at b594a7d
File renamed without changes.

0 commit comments

Comments
 (0)