Do not resolve inside iterEnvs in low-level locators#16642
Merged
Conversation
added 22 commits
July 13, 2021 17:28
added 3 commits
July 13, 2021 17:33
added 2 commits
July 14, 2021 17:47
karthiknadig
approved these changes
Jul 15, 2021
kimadeline
approved these changes
Jul 15, 2021
Comment on lines
+118
to
+120
| function resolveEnvCollision(oldEnv: BasicEnvInfo, newEnv: BasicEnvInfo): BasicEnvInfo { | ||
| const [env] = sortEnvInfoByPriority(oldEnv, newEnv); | ||
| return env; |
There was a problem hiding this comment.
As far as I can see this function is only used in one place, can we replace its call with sortEnvInfoByPriority directly?
Author
There was a problem hiding this comment.
I actually have a follow up PR where we do more stuff inside resolveEnvCollision.
function resolveEnvCollision(oldEnv: BasicEnvInfo, newEnv: BasicEnvInfo): BasicEnvInfo {
const [env] = sortEnvInfoByPriority(oldEnv, newEnv);
const merged = cloneDeep(env);
merged.source = uniq((oldEnv.source ?? []).concat(newEnv.source ?? []));
return merged;
}So I'll keep it as is for this PR.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Closes https://github.com/microsoft/vscode-python-internalbacklog/issues/310
Just focus on the lines added and it won't seem much 😉 All changes are very similar.
This changes the low-level locators to return
BasicEnvInfoinstead ofPythonEnvInfo, which just contains two fields:kindandexecutablePath.Key changes:
ILocatorinterface to support return generic types, so low-level locators returnBasicEnvInfo, meanwhile the API, resolver etc. can still returnPythonEnvInfo.