Use Swiftly's toolchain path if active toolchain is managed by Swiftly #1470
+318
−7
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
On macOS the toolchain path is determined by `xcrun --find swift`. `xcrun` will return paths inside the active Xcode. If the active toolchain is being managed by the newly released Swiftly 1.0 on macOS then the swift path and the toolchain path will be mismatched. Check to see if the active toolchain is managed by Swiftly, and if so point the toolchain path to the Swiftly installed toolchain. The name of the `.xctoolchain` folder needs to be reverse engineered from Swiftly's in use toolchain name using the ToolchainVersion.parse method which was ported from Swiftly's codebase. A nice feature in the future would be to be able to ask Swiftly where its managed toolchains are stored on disk.
plemarquand
requested review from
adam-fowler,
0xTim and
award999
as code owners
award999
approved these changes
Mar 31, 2025
cmcgee1024
reviewed
Mar 31, 2025
| os.homedir(), | ||
| "Library/Developer/Toolchains/", | ||
| `${version.identifier}.xctoolchain`, | ||
| "usr" |
There was a problem hiding this comment.
question: Should this be a path to the <toolchain>/usr/bin where the binaries like swift are located?
There was a problem hiding this comment.
For consistency with other toolchain paths in VS Code they're specified as name.xctoolchain/usr
cmcgee1024
reviewed
Mar 31, 2025
| const version = ToolchainVersion.parse(swiftlyConfig.inUse); | ||
| return path.join( | ||
| os.homedir(), | ||
| "Library/Developer/Toolchains/", |
There was a problem hiding this comment.
question: Should this toolchain function indicates that it is macOS-only?
cmcgee1024
reviewed
Mar 31, 2025
| if (swiftlyHomeDir) { | ||
| const { stdout: swiftLocation } = await execFile("which", ["swift"]); | ||
| if (swiftLocation.indexOf(swiftlyHomeDir) === 0) { | ||
| const swiftlyConfig = await SwiftToolchain.getSwiftlyConfig(); |
There was a problem hiding this comment.
thought: For the in use toolchain, swiftly has a swiftly use --print-location command that will give the filesystem path of the one that's in-use. It can be more expensive than reading the config.json, but it also takes into consideration toolchains that are in-use because of the .swift-version file.
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.
On macOS the toolchain path is determined by
xcrun --find swift.xcrunwill return paths inside the active Xcode. If the active toolchain is being managed by the newly released Swiftly 1.0 on macOS then the swift path and the toolchain path will be mismatched.Check to see if the active toolchain is managed by Swiftly, and if so point the toolchain path to the Swiftly installed toolchain. The name of the
.xctoolchainfolder needs to be reverse engineered from Swiftly's in use toolchain name using the ToolchainVersion.parse method which was ported from Swiftly's codebase. A nice feature in the future would be to be able to ask Swiftly where its managed toolchains are stored on disk.