Fix skip range miscalculation - #7049
Open
matthewhughes934 wants to merge 2 commits into
Open
Conversation
We read the 'significant comments' in `check_files`, so just pass it down rather than re-reading the test file.
Fix a bug in `FmtVisitor::push_skipped_with_span` that assumed `line_number` was always absolute (within a given file) and instead set the end of the range to be the end of the span with the skip attribute. Found while investigating issue rust-lang#6954 (but this commit doesn't address that issue).
rustbot
added
the
S-waiting-on-review
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.
As well as a bit of code tidying
Idempotent test: avoid redundant file reads
We read the 'significant comments' in
check_files, so just pass itdown rather than re-reading the test file.
Fix skip range miscalculated on nested blocks
Fix a bug in
FmtVisitor::push_skipped_with_spanthat assumedline_numberwas always absolute (within a given file) and instead setthe end of the range to be the end of the span with the skip attribute.
Found while investigating issue
rustfmt::skipsometimes ignored when usingerror_on_line_overflowanderror_on_unformatted#6954 (but this commit doesn't addressthat issue).