[Fix #8781] Change how comments are determined for Style/SafeNavigation autocorrection
#8813
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
dvandersluis
force-pushed
the
issue/8781
branch
3 times, most recently
from
3ea5d89
to
9c64fb4
Compare
bbatsov
reviewed
Oct 8, 2020
CHANGELOG.md
Outdated
| @@ -16,6 +16,9 @@ | |||
| * [#8354](https://github.com/rubocop-hq/rubocop/issues/8354): Detect regexp named captures in `Style/CaseLikeIf` cop. ([@dsavochkin][]) | |||
| * [#8830](https://github.com/rubocop-hq/rubocop/issues/8830): Fix bad autocorrect of `Style/StringConcatenation` when string includes double quotes. ([@tleish][]) | |||
| * [#8807](https://github.com/rubocop-hq/rubocop/pull/8807): Fix a false positive for `Style/RedundantCondition` when using assignment by hash key access. ([@koic][]) | |||
| * [#8810](https://github.com/rubocop-hq/rubocop/pull/8810): Fix multiple offense detection for Style/RaiseArgs. ([@pbernays][]) | |||
There was a problem hiding this comment.
Where are those entries coming from? Probably you need to rebase.
dvandersluis
force-pushed
the
issue/8781
branch
from
9c64fb4
to
c42fd5d
Compare
|
@bbatsov I'm not sure! I think I probably caught them in a previous rebase and didn't realize it. I've fixed it up now, thanks. |
dvandersluis
force-pushed
the
issue/8781
branch
3 times, most recently
from
35984e3
to
c425549
Compare
|
Can you rebase again please? |
bbatsov
approved these changes
Oct 16, 2020
…Navigation` autocorrection. Previously, every comment within the source range of the `if` being auto-corrected was captured and moved above the rewritten line. This resulted in comment duplication, as some comments belonged to internal blocks within the if. This change only considers line ranges between internal if blocks as entry points for comments that are allowed to be moved.
dvandersluis
force-pushed
the
issue/8781
branch
from
c425549
to
c5cbacd
Compare
|
@bbatsov done! |
|
Thanks! |
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.
Previously, every comment within the source range of the
ifbeing auto-corrected was captured and moved above the rewritten line. This resulted in comment duplication, as some comments belonged to internal blocks within the if. This change only considers line ranges between internal if blocks as entry points for comments that are allowed to be moved.I had tried looking into
Parser::Source::Comment.associate_locationsas a way to determine what node each comment belonged to, but this does not associate comments in the way we're expecting for this cop.Fixes #8781.
Before submitting the PR make sure the following are checked:
[Fix #issue-number](if the related issue exists).master(if not - rebase it).bundle exec rake default. It executes all tests and RuboCop for itself, and generates the documentation.