Do not read a repeated tool name as an uninstalled one - #803
Merged
Conversation
ToolsOrder.Sort looked each requested tool up in Definitions.Tools, which holds every tool whether it is on the machine or not - so the lookup never failed for a tool that was merely not installed, and throwForNoTool could not mean what it said. What did make the lookup fail was a repeat, since the first occurrence removed the definition from the list. So DiffEngine_ToolOrder=VisualStudio,VisualStudio threw "is not installed" for a tool that was, and it did so from DiffTools' static constructor - which makes it permanent. Every later use of DiffTools in that process is a TypeInitializationException, for a typo in an environment variable. Distinct the order, since a repeated name is a typo and not a request for two. And move the throw to InitTools, where being installed is actually decided, keeping it to tools the caller named rather than to the remainder that is appended anyway. The first version of the duplicate test named VisualStudio and failed for the right reason - it is not installed here - so it now picks an installed tool from DiffTools.Resolved.
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
1 participant
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.
ToolsOrder.Sort looked each requested tool up in Definitions.Tools, which holds
every tool whether it is on the machine or not - so the lookup never failed for
a tool that was merely not installed, and throwForNoTool could not mean what it
said. What did make the lookup fail was a repeat, since the first occurrence
removed the definition from the list.
So DiffEngine_ToolOrder=VisualStudio,VisualStudio threw "is not installed" for a
tool that was, and it did so from DiffTools' static constructor - which makes it
permanent. Every later use of DiffTools in that process is a
TypeInitializationException, for a typo in an environment variable.
Distinct the order, since a repeated name is a typo and not a request for two.
And move the throw to InitTools, where being installed is actually decided,
keeping it to tools the caller named rather than to the remainder that is
appended anyway.
The first version of the duplicate test named VisualStudio and failed for the
right reason - it is not installed here - so it now picks an installed tool from
DiffTools.Resolved.