Correct Semis when reordering stanzas#5915
Merged
aryairani merged 2 commits intounisonweb:trunkfrom Oct 2, 2025
Merged
Conversation
We pull types, ablities, and `use` to the beginning of files and definitions. But if they occur at the end of a block, they don’t have a trailing `Semi`. Reordering in that case would create an invalid stanza. This ensures we add trailing `Semi`s to any stanza not at the end of a block. Fixes unisonweb#686.
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
2 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.
Overview
We pull types, ablities, and
useto the beginning of files anddefinitions. But if they occur at the end of a block, they don’t have a
trailing
Semi. Reordering in that case would create an invalid stanza.This ensures we add trailing
Semis to any stanza not at the end of ablock.
Fixes #686.
Implementation notes
This drops some empty stanzas that weren’t dropped before, which accounts for the changed hashes in some other tests.
Test coverage
Adds a new transcript with two known failure cases.