refactor(xcresult): find a language server without requiring xcrun - #1179
Merged
trunk-io[bot] merged 1 commit intoSep 10, 2026
Conversation
This was referenced Aug 31, 2026
dfrankland
marked this pull request as ready for review
September 8, 2026 18:15
dfrankland
requested review from
TylerJang27,
acatxnamedvirtue and
max-trunk
September 8, 2026 18:44
TylerJang27
approved these changes
Sep 9, 2026
acatxnamedvirtue
approved these changes
Sep 9, 2026
|
Stacked PR 1181 failed testing in the merge queue. Please investigate the failure and re-submit the stack. |
dfrankland
force-pushed
the
dylan/lsp-find-program-cross-platform
branch
from
September 9, 2026 20:10
043e002 to
aced65e
Compare
|
Stacked PR 1181 failed testing in the merge queue. Please investigate the failure and re-submit the stack. |
dfrankland
force-pushed
the
dylan/lsp-find-program-cross-platform
branch
from
September 9, 2026 21:15
aced65e to
5ba5bbc
Compare
dfrankland
force-pushed
the
dylan/lsp-find-program-cross-platform
branch
from
September 9, 2026 21:46
5ba5bbc to
7bfe37a
Compare
|
Stacked PR 1181 failed testing in the merge queue. Please investigate the failure and re-submit the stack. |
dfrankland
force-pushed
the
dylan/lsp-find-program-cross-platform
branch
from
September 10, 2026 04:55
7bfe37a to
98ed02a
Compare
dfrankland
force-pushed
the
dylan/lsp-find-program-cross-platform
branch
from
September 10, 2026 05:33
98ed02a to
f581e0c
Compare
|
Stacked PR 1181 failed testing in the merge queue. Please investigate the failure and re-submit the stack. |
`xcrun --find` is the only way to locate a tool inside an Xcode toolchain, so it is right on macOS and useless anywhere else — it returned `None` off macOS by construction. That was fine while the only consumer read `.xcresult` bundles, which cannot exist without Xcode. The Swift toolchain on Linux ships `sourcekit-lsp` on `PATH` and has no `xcrun` at all, so discovery now tries `xcrun` on macOS and falls back to a `PATH` scan. Nothing else in `test_locations.rs` or `lsp.rs` is platform-specific, which makes this the only thing standing between the declaration index and a non-Apple host. The scan also checks the executable bit rather than just for a file of the right name, so a stray non-executable `sourcekit-lsp` reports "not found" instead of failing later at spawn time with something less obvious. Both new tests run on any platform, which is the point. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
dfrankland
force-pushed
the
dylan/lsp-find-program-cross-platform
branch
from
September 10, 2026 06:14
f581e0c to
5f9e0d4
Compare
|
Stacked PR 1181 failed testing in the merge queue. Please investigate the failure and re-submit the stack. |
|
This pull request was merged into |
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.
Stacked on #1178. Review that first; this is one commit on top.
xcrun --findis the only way to locate a tool inside an Xcode toolchain, so it is right on macOS and useless anywhere else — it returnedNoneoff macOS by construction. That was fine while the only consumer read.xcresultbundles, which cannot exist without Xcode.The Swift toolchain on Linux ships
sourcekit-lsponPATHand has noxcrunat all. Discovery now triesxcrunon macOS and falls back to aPATHscan. Nothing else intest_locations.rsorlsp.rsis platform-specific, so this is the only thing standing between the declaration index and a non-Apple host.The scan also checks the executable bit rather than just for a file of the right name, so a stray non-executable
sourcekit-lspreports "not found" instead of failing later at spawn time with something less obvious.Both new tests run on any platform, which is the point — they inject
PATHrather than mutating it, so they are not racy under parallel test execution.🤖 Generated with Claude Code