[5.10] Add logic to split command line arguments on Windows #1043
Conversation
This file contains 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
|
Could you reduce the change to not move |
z2oh
force-pushed
the
jeremy/5.10/split-windows-command-line
branch
2 times, most recently
from
9ab9744 to
1e1d8d9
Compare
|
Good point; I moved the parsing logic back into |
ahoppen
force-pushed
the
jeremy/5.10/split-windows-command-line
branch
from
1e1d8d9 to
c492c14
Compare
Previously, we were splitting command line arguments on Windows using the same rules as on Unix, which was incorrect, most importantly because backslashes in the first component of a Windows command line invocation are not escaping anything but interpreted verbatim. Fixes apple#1020 rdar://120809063
ahoppen
force-pushed
the
jeremy/5.10/split-windows-command-line
branch
from
c492c14 to
73266b5
Compare
|
Updated the PR to be purely additive in a way that is guaranteed to only affect Windows. |
airspeedswift
approved these changes
Feb 1, 2024
|
@swift-ci please test |
|
@swift-ci Please test Windows |
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.
Explanation: This change implemented Windows-specific command line argument splitting for compilation database fields; previously, the Windows path separator was being interpreted as an escape character.
Scope: Without this change, sourcekit-lsp does not work with compilation databases on Windows. This change refactors command line argument splitting logic into Unix and Windows variants (the Windows variant being new code), with the callsite selecting between them via
#if os(Windows).Issue: Windows path separators in
compile_commands.jsonnot parsed correctly #1020Risk: Low; the change only affects Windows. As sourcekit-lsp was not working with compilation database on Windows before this change, there is no possible regression on this platform.
Testing: I have built and tested the 5.10 toolchain on Windows with this cherry-pick. CI will build and test for other platforms.
Reviewer: @ahoppen, who authored this change and @bnbarham on Add logic to split command line arguments on Windows #1028