Skip to content

Conversation

karrtikr
Copy link

@karrtikr karrtikr commented Feb 18, 2021

We fallback on Jedi if we're unable to start the configured LS, hence register it always. Fixes flaky tests https://github.com/microsoft/vscode-python/runs/1921832928 where we attempt to access Jedi, but it is not available as it wasn't registered.

@karrtikr karrtikr added the no-changelog No news entry required label Feb 18, 2021
@karrtikr karrtikr marked this pull request as ready for review February 18, 2021 23:46
@github-actions github-actions bot requested a review from kimadeline February 18, 2021 23:47
traceError(ex);
this.output.appendLine(LanguageService.lsFailedToStart());
serverType = LanguageServerType.Jedi;
server = this.serviceContainer.get<ILanguageServerActivator>(ILanguageServerActivator, serverType);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Voila

@karrtikr karrtikr removed the no-changelog No news entry required label Feb 18, 2021
@codecov-io
Copy link

Codecov Report

Merging #15452 (170daaf) into main (cbdbe0a) will decrease coverage by 0%.
The diff coverage is 100%.

@@          Coverage Diff           @@
##            main   #15452   +/-   ##
======================================
- Coverage     65%      65%   -1%     
======================================
  Files        560      561    +1     
  Lines      26926    26944   +18     
  Branches    3900     3908    +8     
======================================
- Hits       17535    17530    -5     
- Misses      8666     8688   +22     
- Partials     725      726    +1     
Impacted Files Coverage Δ
src/client/activation/activationService.ts 88% <100%> (+<1%) ⬆️
src/client/activation/serviceRegistry.ts 80% <100%> (+2%) ⬆️
src/client/testing/common/types.ts 93% <0%> (-7%) ⬇️
...nts/base/locators/composite/environmentsReducer.ts 94% <0%> (-3%) ⬇️
src/client/testing/pytest/main.ts 39% <0%> (-3%) ⬇️
src/client/testing/nosetest/main.ts 44% <0%> (-2%) ⬇️
src/client/testing/pytest/runner.ts 16% <0%> (-2%) ⬇️
src/client/testing/nosetest/runner.ts 16% <0%> (-2%) ⬇️
src/client/pythonEnvironments/base/locatorUtils.ts 58% <0%> (-2%) ⬇️
...ts/base/locators/composite/environmentsResolver.ts 94% <0%> (-2%) ⬇️
... and 46 more

@kimadeline
Copy link

This shouldn't impact the Pylance prompt, right? The one when I have it selected as my language server, but it's not installed?

@karrtikr
Copy link
Author

Not at all, this is just registration code.

@karrtikr karrtikr merged commit a2311c1 into microsoft:main Feb 19, 2021
@karrtikr karrtikr deleted the jedilsks branch February 19, 2021 20:00
karthiknadig pushed a commit to karthiknadig/vscode-python that referenced this pull request Feb 19, 2021
…soft#15452)

* Register Jedi regardless of what language server is configured

* News entry
karthiknadig added a commit that referenced this pull request Mar 8, 2021
* Cherry pick fix for native notebook support into release branch (#15369)

* Fix problem with notebook apis not being used. (#15366)

* Update changelog

* Remove news file

* Add extraPaths support to JediLSP (#15365)

* Add extraPaths support

* Remove duplicate opt option

* Eslint cleanup

* Fix tests

* Ignore directories with the same name as python binaries (#15367)

* Ignore directories with the same name as pyhton binaries

* Use withFileTypes instead of lstat

* Correct pipenv activation provider when in discovery experiment (#15319)

* Correct pipenv activation provider when in discovery experiment

* Fix ESLint errors

* In PythonEnvsReducer.resolveEnv(), always fall back to the wrapped locator. (#15350)

fixes #15118

* Fix issue with missing interpreter info for some cases  (#15376)

* Use child process apis directly.

* Use raw API in process service

* Handle process cleanup

* Address sonar

* Refactor process service by pulling the raw process APIs out of the class

* Address comments

* Add reference to CVE-2020-16977 fixed in Oct 2020. (#15381)

* Fix CI failing with the number of constructor arguments error (#15347)

* Fix Command 'workbench.action.closeAllEditors' timed out failure on CI (#15322)

* Ensure environment variables provider can be created using standard classes (#15377)

* Ensure environment variables provider can be created using standard classes

* Fix unit tests

* Fix ESLint errors for environment variable provider (#15383)

* Fix problem with notebook apis not being used. (#15366)

* Show Python: Launch TensorBoard command in command palette (#15382) (#15386)

* Always register Launch TensorBoard command

* Put usage tracking behind experiment

* Cherry picks from main to release (#15421)

* Do not call activate the discovery component before registering all the classes (#15379)

* Do not attempt to activate discovery component before registering all the classes

* Add clarification comment

* Code reviews

* Skip windows store and shims paths when using known path locators (#15388)

* Skip windows store and shims paths when using known path locators

* Clean up and comments

* Tests

* Handle cases where envs variables might not be set

* Typo

Co-authored-by: Kim-Adeline Miguel <51720070+kimadeline@users.noreply.github.com>

Co-authored-by: Kim-Adeline Miguel <51720070+kimadeline@users.noreply.github.com>

* Change "Pylance not installed" prompt to allow reverting to Jedi (#15420)

* Allow on suggestion refresh by default (#15430)

Co-authored-by: Kartik Raj <karraj@microsoft.com>
Co-authored-by: Kim-Adeline Miguel <51720070+kimadeline@users.noreply.github.com>
Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com>

* Release final (#15433)

* Version update

* Change log updates

* TPN update

* Ensure pyenv virtual envs are not skipped when in discovery experiment (#15451)

* Ensure pyenv virtual envs are not skipped

* Add news

* Clean up

* Address comments

* Register Jedi regardless of what language server is configured (#15452)

* Register Jedi regardless of what language server is configured

* News entry

* Only call component adapter behind the discovery experiment (#15459)

* Update version and change log for point release (#15463)

* Version update

* Update change log

* Update start-up telemetry for Jedi LSP (#15419) (#15571)

* Version and change log update for point release (#15572)

Co-authored-by: Rich Chiodo <rchiodo@users.noreply.github.com>
Co-authored-by: Kartik Raj <karraj@microsoft.com>
Co-authored-by: Eric Snow <eric.snow@microsoft.com>
Co-authored-by: Jim Griesmer <jimgries@microsoft.com>
Co-authored-by: Joyce Er <joyceerhuiling@gmail.com>
Co-authored-by: Kim-Adeline Miguel <51720070+kimadeline@users.noreply.github.com>
Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants