Skip to content

Commit 888333e

Browse files
karthiknadigkarthiknadig
committed
Fallback to jedi when using python 2.7, <=3.5 (#15734)
* Fallback to jedi when using 2.7 * Address comments. * Update jedi-language-server to latest again
1 parent 9718b72 commit 888333e

File tree

13 files changed

+161
-118
lines changed

13 files changed

+161
-118
lines changed

‎.github/actions/build-vsix/action.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ runs:
1616
- run: python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
1717
shell: bash
1818

19+
- run: python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --no-deps --upgrade -r jedils_requirements.txt
20+
shell: bash
21+
1922
- run: |
2023
python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
2124
python ./pythonFiles/install_debugpy.py

‎gulpfile.js‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ gulp.task('checkDependencies', gulp.series('checkNativeDependencies'));
215215
gulp.task('prePublishNonBundle', gulp.series('compile', 'compile-webviews'));
216216

217217
gulp.task('installPythonRequirements', async () => {
218-
const args = [
218+
let args = [
219219
'-m',
220220
'pip',
221221
'--disable-pip-version-check',
@@ -230,7 +230,36 @@ gulp.task('installPythonRequirements', async () => {
230230
'-r',
231231
'./requirements.txt',
232232
];
233-
const success = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', args, undefined, true)
233+
let success = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', args, undefined, true)
234+
.then(() => true)
235+
.catch((ex) => {
236+
console.error("Failed to install Python Libs using 'python3'", ex);
237+
return false;
238+
});
239+
if (!success) {
240+
console.info("Failed to install Python Libs using 'python3', attempting to install using 'python'");
241+
await spawnAsync('python', args).catch((ex) =>
242+
console.error("Failed to install Python Libs using 'python'", ex),
243+
);
244+
return;
245+
}
246+
247+
args = [
248+
'-m',
249+
'pip',
250+
'--disable-pip-version-check',
251+
'install',
252+
'-t',
253+
'./pythonFiles/lib/jedilsp',
254+
'--no-cache-dir',
255+
'--implementation',
256+
'py',
257+
'--no-deps',
258+
'--upgrade',
259+
'-r',
260+
'./jedils_requirements.txt',
261+
];
262+
success = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', args, undefined, true)
234263
.then(() => true)
235264
.catch((ex) => {
236265
console.error("Failed to install Python Libs using 'python3'", ex);

‎jedils_requirements.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# This file is used to generate requirements.txt.
2+
# To update requirements.txt, run the following commands.
3+
# 1) pip install pip-tools
4+
# 2) pip-compile --generate-hashes jedils_requirements.in
5+
6+
jedi-language-server

‎jedils_requirements.txt‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
#
2+
# This file is autogenerated by pip-compile
3+
# To update, run:
4+
#
5+
# pip-compile --generate-hashes jedils_requirements.in
6+
#
7+
click==7.1.2 \
8+
--hash=sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a \
9+
--hash=sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc
10+
# via jedi-language-server
11+
docstring-to-markdown==0.7 \
12+
--hash=sha256:374bad3595b970bc558e1422225f313229988424d5b242d85cbda7da30370375 \
13+
--hash=sha256:d1811fb2ad38bf8ac24e8bac6c74503cdb120a6a3b2c62bf9a0ab44a59656901
14+
# via jedi-language-server
15+
jedi-language-server==0.28.7 \
16+
--hash=sha256:7d22a87cf2017f439f872e7d630101969dcff4ef2aa061d10aa697b42de7351c \
17+
--hash=sha256:8a53e65d4dff8aff74626d729c942a4b887f63b241270dba9cb4ebefaa92a006
18+
# via -r jedils_requirements.in
19+
jedi==0.18.0 \
20+
--hash=sha256:18456d83f65f400ab0c2d3319e48520420ef43b23a086fdc05dff34132f0fb93 \
21+
--hash=sha256:92550a404bad8afed881a137ec9a461fed49eca661414be45059329614ed0707
22+
# via jedi-language-server
23+
parso==0.8.1 \
24+
--hash=sha256:15b00182f472319383252c18d5913b69269590616c947747bc50bf4ac768f410 \
25+
--hash=sha256:8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e
26+
# via jedi
27+
psutil==5.8.0 \
28+
--hash=sha256:0066a82f7b1b37d334e68697faba68e5ad5e858279fd6351c8ca6024e8d6ba64 \
29+
--hash=sha256:02b8292609b1f7fcb34173b25e48d0da8667bc85f81d7476584d889c6e0f2131 \
30+
--hash=sha256:0ae6f386d8d297177fd288be6e8d1afc05966878704dad9847719650e44fc49c \
31+
--hash=sha256:0c9ccb99ab76025f2f0bbecf341d4656e9c1351db8cc8a03ccd62e318ab4b5c6 \
32+
--hash=sha256:0dd4465a039d343925cdc29023bb6960ccf4e74a65ad53e768403746a9207023 \
33+
--hash=sha256:12d844996d6c2b1d3881cfa6fa201fd635971869a9da945cf6756105af73d2df \
34+
--hash=sha256:1bff0d07e76114ec24ee32e7f7f8d0c4b0514b3fae93e3d2aaafd65d22502394 \
35+
--hash=sha256:245b5509968ac0bd179287d91210cd3f37add77dad385ef238b275bad35fa1c4 \
36+
--hash=sha256:28ff7c95293ae74bf1ca1a79e8805fcde005c18a122ca983abf676ea3466362b \
37+
--hash=sha256:36b3b6c9e2a34b7d7fbae330a85bf72c30b1c827a4366a07443fc4b6270449e2 \
38+
--hash=sha256:52de075468cd394ac98c66f9ca33b2f54ae1d9bff1ef6b67a212ee8f639ec06d \
39+
--hash=sha256:5da29e394bdedd9144c7331192e20c1f79283fb03b06e6abd3a8ae45ffecee65 \
40+
--hash=sha256:61f05864b42fedc0771d6d8e49c35f07efd209ade09a5afe6a5059e7bb7bf83d \
41+
--hash=sha256:6223d07a1ae93f86451d0198a0c361032c4c93ebd4bf6d25e2fb3edfad9571ef \
42+
--hash=sha256:6323d5d845c2785efb20aded4726636546b26d3b577aded22492908f7c1bdda7 \
43+
--hash=sha256:6ffe81843131ee0ffa02c317186ed1e759a145267d54fdef1bc4ea5f5931ab60 \
44+
--hash=sha256:74f2d0be88db96ada78756cb3a3e1b107ce8ab79f65aa885f76d7664e56928f6 \
45+
--hash=sha256:74fb2557d1430fff18ff0d72613c5ca30c45cdbfcddd6a5773e9fc1fe9364be8 \
46+
--hash=sha256:90d4091c2d30ddd0a03e0b97e6a33a48628469b99585e2ad6bf21f17423b112b \
47+
--hash=sha256:90f31c34d25b1b3ed6c40cdd34ff122b1887a825297c017e4cbd6796dd8b672d \
48+
--hash=sha256:99de3e8739258b3c3e8669cb9757c9a861b2a25ad0955f8e53ac662d66de61ac \
49+
--hash=sha256:c6a5fd10ce6b6344e616cf01cc5b849fa8103fbb5ba507b6b2dee4c11e84c935 \
50+
--hash=sha256:ce8b867423291cb65cfc6d9c4955ee9bfc1e21fe03bb50e177f2b957f1c2469d \
51+
--hash=sha256:d225cd8319aa1d3c85bf195c4e07d17d3cd68636b8fc97e6cf198f782f99af28 \
52+
--hash=sha256:ea313bb02e5e25224e518e4352af4bf5e062755160f77e4b1767dd5ccb65f876 \
53+
--hash=sha256:ea372bcc129394485824ae3e3ddabe67dc0b118d262c568b4d2602a7070afdb0 \
54+
--hash=sha256:f4634b033faf0d968bb9220dd1c793b897ab7f1189956e1aa9eae752527127d3 \
55+
--hash=sha256:fcc01e900c1d7bee2a37e5d6e4f9194760a93597c97fee89c4ae51701de03563
56+
# via pygls
57+
pydantic==1.8.1 \
58+
--hash=sha256:0c40162796fc8d0aa744875b60e4dc36834db9f2a25dbf9ba9664b1915a23850 \
59+
--hash=sha256:20d42f1be7c7acc352b3d09b0cf505a9fab9deb93125061b376fbe1f06a5459f \
60+
--hash=sha256:2287ebff0018eec3cc69b1d09d4b7cebf277726fa1bd96b45806283c1d808683 \
61+
--hash=sha256:258576f2d997ee4573469633592e8b99aa13bda182fcc28e875f866016c8e07e \
62+
--hash=sha256:26cf3cb2e68ec6c0cfcb6293e69fb3450c5fd1ace87f46b64f678b0d29eac4c3 \
63+
--hash=sha256:2f2736d9a996b976cfdfe52455ad27462308c9d3d0ae21a2aa8b4cd1a78f47b9 \
64+
--hash=sha256:3114d74329873af0a0e8004627f5389f3bb27f956b965ddd3e355fe984a1789c \
65+
--hash=sha256:3bbd023c981cbe26e6e21c8d2ce78485f85c2e77f7bab5ec15b7d2a1f491918f \
66+
--hash=sha256:3bcb9d7e1f9849a6bdbd027aabb3a06414abd6068cb3b21c49427956cce5038a \
67+
--hash=sha256:4bbc47cf7925c86a345d03b07086696ed916c7663cb76aa409edaa54546e53e2 \
68+
--hash=sha256:6388ef4ef1435364c8cc9a8192238aed030595e873d8462447ccef2e17387125 \
69+
--hash=sha256:830ef1a148012b640186bf4d9789a206c56071ff38f2460a32ae67ca21880eb8 \
70+
--hash=sha256:8fbb677e4e89c8ab3d450df7b1d9caed23f254072e8597c33279460eeae59b99 \
71+
--hash=sha256:c17a0b35c854049e67c68b48d55e026c84f35593c66d69b278b8b49e2484346f \
72+
--hash=sha256:dd4888b300769ecec194ca8f2699415f5f7760365ddbe243d4fd6581485fa5f0 \
73+
--hash=sha256:dde4ca368e82791de97c2ec019681ffb437728090c0ff0c3852708cf923e0c7d \
74+
--hash=sha256:e3f8790c47ac42549dc8b045a67b0ca371c7f66e73040d0197ce6172b385e520 \
75+
--hash=sha256:e8bc082afef97c5fd3903d05c6f7bb3a6af9fc18631b4cc9fedeb4720efb0c58 \
76+
--hash=sha256:eb8ccf12295113ce0de38f80b25f736d62f0a8d87c6b88aca645f168f9c78771 \
77+
--hash=sha256:fb77f7a7e111db1832ae3f8f44203691e15b1fa7e5a1cb9691d4e2659aee41c4 \
78+
--hash=sha256:fbfb608febde1afd4743c6822c19060a8dbdd3eb30f98e36061ba4973308059e \
79+
--hash=sha256:fff29fe54ec419338c522b908154a2efabeee4f483e48990f87e189661f31ce3
80+
# via
81+
# jedi-language-server
82+
# pygls
83+
pygls==0.10.1 \
84+
--hash=sha256:133b3987fc6dee992dc32b9a77f1452f9de44cb7141328b5c85a184e68c083d5 \
85+
--hash=sha256:ab0cd3273e265e792b926ad621ab10199a3bd0e7b8786233e9eda54cc1071e3a
86+
# via jedi-language-server
87+
typeguard==2.11.1 \
88+
--hash=sha256:33243c1cbfcb9736a06c6db22dd08876b5f297e6344aa272a2862c0f8e669f64 \
89+
--hash=sha256:c62706201ec6c14962162fa67d70bd2762753247533d70ff2442e5ac08f94fa2
90+
# via pygls
91+
typing-extensions==3.7.4.3 \
92+
--hash=sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918 \
93+
--hash=sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c \
94+
--hash=sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f
95+
# via pydantic

‎news/2 Fixes/15724.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgrade to latest `jedi-language-server` and use it for python >= 3.6. Use `jedi<0.18` for python 2.7 and <=3.5.

‎pythonFiles/run-jedi-language-server.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import sys
2+
import os
3+
4+
# Add the lib path to our sys path so jedi_language_server can find its references
5+
EXTENSION_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
6+
sys.path.insert(0, os.path.join(EXTENSION_ROOT, "pythonFiles", "lib", "jedilsp"))
7+
8+
9+
from jedi_language_server.cli import cli
10+
11+
sys.exit(cli())

‎pythonFiles/runJediLanguageServer.py‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎requirements.in‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,5 @@
55

66
# IntelliSense via Jedi
77
jedi<0.18 # For Python 2.7 support
8-
pygls; python_version >= '3.6' # To make requirements.txt keep the marker to avoid Python 2.7.
9-
jedi-language-server<0.22; python_version >= '3.6' # To work with Jedi 0.17.
108
# Sort Imports
119
isort==5.7.0; python_version >= '3.6'
12-
cached-property>=1.5.1

‎requirements.txt‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,15 @@
44
#
55
# pip-compile --generate-hashes requirements.in
66
#
7-
cached-property==1.5.2 \
8-
--hash=sha256:9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130 \
9-
--hash=sha256:df4f613cf7ad9a588cc381aaf4a512d26265ecebd5eb9e1ba12f1319eb85a6a0
10-
# via -r requirements.in
11-
click==7.1.2 \
12-
--hash=sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a \
13-
--hash=sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc
14-
# via jedi-language-server
157
isort==5.7.0 ; python_version >= "3.6" \
168
--hash=sha256:c729845434366216d320e936b8ad6f9d681aab72dc7cbc2d51bedc3582f3ad1e \
179
--hash=sha256:fff4f0c04e1825522ce6949973e83110a6e907750cd92d128b0d14aaaadbffdc
1810
# via -r requirements.in
19-
jedi-language-server==0.21.0 ; python_version >= "3.6" \
20-
--hash=sha256:7d7ffcb884ac469be1d1d7d286c1c9484c25f08b049c951bec8bf4c88e0cc6b0 \
21-
--hash=sha256:bb9d5e5c0aadf69cc441263685c83c12e67b6ed6f546dbd92dbed417123d8a47
22-
# via -r requirements.in
2311
jedi==0.17.2 \
2412
--hash=sha256:86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20 \
2513
--hash=sha256:98cc583fa0f2f8304968199b01b6b4b94f469a1f4a74c1560506ca2a211378b5
26-
# via
27-
# -r requirements.in
28-
# jedi-language-server
14+
# via -r requirements.in
2915
parso==0.7.1 \
3016
--hash=sha256:97218d9159b2520ff45eb78028ba8b50d2bc61dcc062a9682666f2dc4bd331ea \
3117
--hash=sha256:caba44724b994a8a5e086460bb212abc5a8bc46951bf4a9a1210745953622eb9
3218
# via jedi
33-
pygls==0.9.1 ; python_version >= "3.6" \
34-
--hash=sha256:89b4361e0ba38effdfc735e25ae207c8af2f4d4ce26961e8628b600f19b16ed4 \
35-
--hash=sha256:c21c942415457315f316c0b6c19d4c743fd2974d457e02a85472154c8f1b6399
36-
# via
37-
# -r requirements.in
38-
# jedi-language-server

‎src/client/activation/activationService.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,13 @@ export class LanguageServerExtensionActivationService
233233
}
234234
}
235235

236+
if (serverType === LanguageServerType.JediLSP && interpreter && interpreter.version) {
237+
if (interpreter.version.major < 3 || (interpreter.version.major === 3 && interpreter.version.minor < 6)) {
238+
sendTelemetryEvent(EventName.JEDI_LANGUAGE_SERVER_FALLBACK);
239+
serverType = LanguageServerType.Jedi;
240+
}
241+
}
242+
236243
this.sendTelemetryForChosenLanguageServer(serverType).ignoreErrors();
237244

238245
await this.logStartup(serverType);

0 commit comments

Comments
 (0)