Fixes & minor cleanup of kernel finder #5824
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DonJayamanne
commented
May 10, 2021
DonJayamanne
commented
May 10, 2021
DonJayamanne
commented
May 10, 2021
| if (r.kind !== 'connectToLiveKernel' && r.kernelSpec) { | ||
| if ( | ||
| r.kernelSpec.metadata?.vscode?.extension_id && | ||
| this.extensions.getExtension(r.kernelSpec.metadata?.vscode?.extension_id) |
There was a problem hiding this comment.
Moved to a common location (localKernelFinder.ts)
Codecov Report
@@ Coverage Diff @@
## main #5824 +/- ##
=======================================
- Coverage 72% 63% -9%
=======================================
Files 403 403
Lines 26946 26953 +7
Branches 3932 3933 +1
=======================================
- Hits 19425 17037 -2388
- Misses 5889 8503 +2614
+ Partials 1632 1413 -219
|
DonJayamanne
commented
May 10, 2021
| score = 1; | ||
| } | ||
| // Give python 3 environments a higher priority over others. | ||
| // E.g. if we end up just looking at the suppof ot ehe languages, then Python2 & Python3 will both get 1. | ||
| // But Python 3 is definitely preferred over Python 2. | ||
| if ( | ||
| speclanguage === PYTHON_LANGUAGE && | ||
| nbMetadataLanguage === PYTHON_LANGUAGE && |
There was a problem hiding this comment.
This was wrong
DonJayamanne
commented
May 10, 2021
| @@ -471,14 +471,19 @@ export function findPreferredKernel( | |||
| } | |||
|
|
|||
| // Find a kernel spec that matches the language in the notebook metadata. | |||
| if (score <= 0 && speclanguage === (nbMetadataLanguage || '')) { | |||
| if (score <= 0 && nbMetadataLanguage && speclanguage === (nbMetadataLanguage || '')) { | |||
There was a problem hiding this comment.
This is incorrect, we need to ensure we have a language, else we match anything that doesnt' have a language or for those where it cannot be determined.
DonJayamanne
changed the title
joyceerhl
approved these changes
May 10, 2021
rchiodo
approved these changes
May 10, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix to address a broken test
(tough when CI is busted)