Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Ensure languageServer value is valid, send event during activate #13064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 21, 2020

Conversation

jakebailey
Copy link
Member

@jakebailey jakebailey commented Jul 21, 2020

This value is read directly from the settings without validation; since the type is an enum, it's assumed that it's one of the valid values. Check if the resolved value is actually one of the enum's options, and switch it to the default if not.

During activation, send the current setting event during activation after the actual LS type is chosen, not arbitrarily during isJedi().

  • Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR).
  • Title summarizes what is changing.
  • Has a news entry file (remember to thank yourself!).
  • Appropriate comments and documentation strings in the code.
  • Has sufficient logging.
  • Has telemetry for enhancements.
  • Unit tests & system/integration tests are added/updated.
  • Test plan is updated as appropriate.
  • package-lock.json has been regenerated by running npm install (if dependencies have changed).
  • The wiki is updated with any design decisions/details.

@jakebailey jakebailey added the no-changelog No news entry required label Jul 21, 2020
@jakebailey
Copy link
Member Author

The test times out when run via the CLI, but not when I run and am attached. I have no idea why.

@jakebailey
Copy link
Member Author

Apparently if you don't set a pythonPath during this test, things break. Odd.

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@codecov-commenter
Copy link

codecov-commenter commented Jul 21, 2020

Codecov Report

❗ No coverage uploaded for pull request base (master@85438cb). Click here to learn what that means.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #13064   +/-   ##
=========================================
  Coverage          ?   59.85%           
=========================================
  Files             ?      671           
  Lines             ?    36653           
  Branches          ?     5153           
=========================================
  Hits              ?    21938           
  Misses            ?    13617           
  Partials          ?     1098           
Impacted Files Coverage Δ
src/client/activation/activationService.ts 84.79% <100.00%> (ø)
src/client/common/configSettings.ts 72.75% <100.00%> (ø)
src/client/datascience/progress/types.ts 100.00% <0.00%> (ø)
.../application/diagnostics/checks/envPathVariable.ts 93.02% <0.00%> (ø)
src/client/datascience/notebook/types.ts 100.00% <0.00%> (ø)
src/client/common/experiments/service.ts 100.00% <0.00%> (ø)
...client/datascience/raw-kernel/rawJupyterSession.ts 16.32% <0.00%> (ø)
src/client/datascience/commands/serverSelector.ts 85.71% <0.00%> (ø)
src/datascience-ui/react-common/arePathsSame.ts 37.50% <0.00%> (ø)
src/client/common/startPage/startPage.ts 31.87% <0.00%> (ø)
... and 663 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 85438cb...ee47e39. Read the comment docs.

Copy link

@kimadeline kimadeline left a comment

Choose a reason for hiding this comment

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

The pythonPath expectation in the test probably has to do with how pythonSettings.get<string>('pythonPath') is called inPythonSettings.getPythonPath 🤔 A bit obscure though yeah

@jakebailey jakebailey merged commit 986980a into microsoft:master Jul 21, 2020
@jakebailey jakebailey deleted the fix-ls-current-selection branch July 21, 2020 17:08
karthiknadig pushed a commit to karthiknadig/vscode-python that referenced this pull request Jul 21, 2020
karthiknadig added a commit that referenced this pull request Jul 22, 2020
* Ensure languageServer value is valid, send event during activate (#13064)

* Update change log and version

* Activate banner prompt for Pylance (#12817)

* Fix path

* Actually fix settings

* Add news

* Add test

* Format

* Suppress 'jediEnabled' removal

* Drop survey first launch threshold

* Remove LS experiments

* Frequency + tests

* Fix test

* Update message to match spec

* Open workspace for extension rather than changing setting

* Fix localization string

* Show banners asynchronously

* Add experiments

* Formatting

* Typo

* Put back verifyAll

* Remove obsolete experiments, add Pylance

* Suppress experiment if Pylance is installed

* PR feedback

Co-authored-by: Jake Bailey <[email protected]>

* Update change log as per comments

Co-authored-by: Jake Bailey <[email protected]>
Co-authored-by: Mikhail Arkhipov <[email protected]>
karthiknadig added a commit that referenced this pull request Aug 5, 2020
* Update model.isTrusted on trust change (#12820) (#12823)

* Reduce visual complexity of trust prompt (#12839) (#12847)

* Port python 2.7 fix to release (#12877)

* port color fix on collapse all (#12895) (#12897)

* fix a color on collapse all (#12895)

* update changelog

* Merge fixes into July release (#12889)

Co-authored-by: Timothy Ruscica <[email protected]>

* Merge more fixes into july release (#12918)

Co-authored-by: Joyce Er <[email protected]>

* Port trust fixes (#12929)

* Fix regressions in trusted notebooks (#12902)

* Handle trustAllNotebooks selection

* Fix bug where after trusting, UI didn't update

* Recover from ENOENT due to missing parent directory when trusting notebook (#12913)

* Disable keydown on native cells in untrusted notebooks (#12914)

* Hide editor icons when editor is not a notebook (#12934) (#12935)

* Check for hideFromUser before activating current terminal (#12942) (#12956)

* Check for hideFromUser before activating current terminal

* Add tests

* Tweak logic

* Port final trust fixes for release (#12965)

* Only allow Enter / NumpadEnter w/o ctrl/shift/alt (#12939)

* Send telemetry for notebook trust prompt selections (#12964)

* Fixes for persisting trust (#12950)

* Display survey for native notebooks on/after 1st August (#12961) (#12975)

Co-authored-by: Joyce Er <[email protected]>

Co-authored-by: Joyce Er <[email protected]>

* Contains cherry picks, version updates, change log updates (#12983)

* Update version and change log

* Improve detection when LS is fully loaded for IntelliCode (#12853)

* Fix path

* Actually fix settings

* Add news

* Add test

* Format

* Suppress 'jediEnabled' removal

* Drop survey first launch threshold

* Wait for client ready

* Handle async dispose

* Fix the date

Co-authored-by: Mikhail Arkhipov <[email protected]>

* hide the gather button while a cell is executing (#12984)

* Update date (#13002)

* remove release notes from the start page (#13032)

* Cherry pick, version change and change log update (#13079)

* Ensure languageServer value is valid, send event during activate (#13064)

* Update change log and version

* Activate banner prompt for Pylance (#12817)

* Fix path

* Actually fix settings

* Add news

* Add test

* Format

* Suppress 'jediEnabled' removal

* Drop survey first launch threshold

* Remove LS experiments

* Frequency + tests

* Fix test

* Update message to match spec

* Open workspace for extension rather than changing setting

* Fix localization string

* Show banners asynchronously

* Add experiments

* Formatting

* Typo

* Put back verifyAll

* Remove obsolete experiments, add Pylance

* Suppress experiment if Pylance is installed

* PR feedback

Co-authored-by: Jake Bailey <[email protected]>

* Update change log as per comments

Co-authored-by: Jake Bailey <[email protected]>
Co-authored-by: Mikhail Arkhipov <[email protected]>

* Port fix the gather survey (#13086) (#13105)

* Fix the gather survey (#13086)

* fix the gather survey
added 'gather stats' telemetry
mention the gather comments to update the python ext

* oops

* fix tests and address comments

* update gather stats when resetting the kernel

* set globalstate vars to 0 when we open vs code

* fix gather stats telemetry

* fix tests

* fix tests for real

Co-authored-by: Joyce Er <[email protected]>
Co-authored-by: Ian Huff <[email protected]>
Co-authored-by: David Kutugata <[email protected]>
Co-authored-by: Don Jayamanne <[email protected]>
Co-authored-by: Timothy Ruscica <[email protected]>
Co-authored-by: Mikhail Arkhipov <[email protected]>
Co-authored-by: Jake Bailey <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-changelog No news entry required
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants