Skip to content

Cherry-pick PRs from main to release/5.9 #1475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Mar 31, 2023

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented Mar 31, 2023

This cherry-picks the following PRs to release/5.9, effectively bringing release/5.9 up-to-date with main

ahoppen and others added 16 commits March 30, 2023 21:04
Enable assertions in Release+Assert builds of earlyswiftsyntax
Replace `assert` by `precondition` in most places
…-choices

Add a conditional compilation flag to verify token choices
If no explicit highlight range was given, highlight the node the diagnostic is anchored at instead of highlighting nothing
…stic-for-missing-left-brace-or-if-after-else
…matches

Fix multiple cases where the parser produced token kinds that didn’t match the token kinds in the syntax node definitions
…n-macos-only

Only output number of executed instructions in `swift-parser-cli` on macOS
@ahoppen ahoppen requested a review from DougGregor as a code owner March 31, 2023 04:20
@ahoppen ahoppen changed the base branch from main to release/5.9 March 31, 2023 04:20
@ahoppen
Copy link
Member Author

ahoppen commented Mar 31, 2023

@swift-ci Please test

@kimdv
Copy link
Contributor

kimdv commented Mar 31, 2023

To the editor placeholder we also need to cherry pick in the swift repo. If that also have a 5.9 branch

@ahoppen
Copy link
Member Author

ahoppen commented Mar 31, 2023

swiftlang/swift#64805

@swift-ci Please test

@ahoppen
Copy link
Member Author

ahoppen commented Mar 31, 2023

To the editor placeholder we also need to cherry pick in the swift repo. If that also have a 5.9 branch

Thanks for keeping track of things. I forgot about that. I opened swiftlang/swift#64805.

@ahoppen
Copy link
Member Author

ahoppen commented Mar 31, 2023

swiftlang/swift#64805

@swift-ci Please test macOS

@ahoppen ahoppen merged commit 56214d1 into swiftlang:release/5.9 Mar 31, 2023
@ahoppen ahoppen deleted the ahoppen/cherry-pick branch March 31, 2023 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants