[sourcekit-lsp] Prefer containing toolchain if applicable #139
Conversation
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
In preparation for looking for toolchain next to the sourcekit-lsp binary, teach toolchain loading to find the info plist even if we are using the path `Foo.xctoolchain/usr/bin` instead of `Foo.xctoolchain`.
When the ToolchainRegistry is used in code embedded into a toolchain, we want to prefer that toolchain over any other search paths other than the explicit SOURCEKIT_TOOLCHAIN_PATH environment.
When sourcekit-lsp is embedded inside a toolchain, use its main bundle path as the install path to have the toolchain registry prefer that toolcahin.
There is not guarantee that the toolchain.path contains `usr/bin`. Instead, look at the diretory containing `swiftc`.
|
@swift-ci please test |
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.
If the sourcekit-lsp binary is embedded inside a toolchain, pass that install path to the toolchain registry and use it by default.