[utils] add support for remarks to update-verify-tests, fix minor bugs #85399
+701
−75
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
`expected-expansion` can be a bit unergonomic to use, because it requires pointing out not only the line, but also the column (which is not always obvious), and the nested diagnostics have to refer to absolute lines that aren't present in the source file. This makes both creating and updating these test cases easier through automation.
This fixes a bug that was introduced where two diagnostics on the same line, with the same content, would be emitted separately if they occurred on separate columns. This despite the fact that neither of these checks specify the column when emitted. The checks are now properly merged again.
When replacing expected diagnostic content, we should consider expected diagnostics targeting the same target, not targeting the line the expected diagnostic is on.
This fixes a bug in the diagnostic stealing logic when multiple diagnostics target the same line, which would trigger an assert.
hnrklssn
requested review from
Xazax-hun,
egorzhdan,
j-hui,
susmonteiro and
xedin
Member
Author
|
@swift-ci please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This adds support for remarks, and fixes 3 minor bugs related to existing expected- diagnostics in the source file being replaced or removed.
This is based on top of #85390, so only the last 4 commits actually belong to this PR.