[Fix #9731] Fix two autocorrection issues for Style/NegatedIfElseCondition
#9756
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
commented
May 1, 2021
Comment on lines
+53
to
+66
| it 'registers an offens and corrects a multiline ternary' do | ||
| expect_offense(<<~RUBY) | ||
| !x ? | ||
| ^^^^ Invert the negated condition and swap the ternary branches. | ||
| do_something : | ||
| do_something_else # comment | ||
| RUBY | ||
|
|
||
| expect_correction(<<~RUBY) | ||
| x ? | ||
| do_something_else : | ||
| do_something # comment | ||
| RUBY | ||
| end |
There was a problem hiding this comment.
This doesn't actually correct the comment properly but I wanted to add a test for this case just to document behaviour. Really no one should be writing multiline ternaries like this. 😏
koic
reviewed
May 2, 2021
koic
reviewed
May 2, 2021
…ElseCondition`. Previously, when swapping the `if` and `else` branches, if one of the branches only had a single statement, the branch would end up not being spaced out properly. Additionally, when there is a node with a comment inside the `if` that has an identical node with a comment *before* the `if` statement, `CommentsHelp.begin_pos_with_comment` returns an incorrect range, which was causing a clobbering error. I fixed this by creating ranges of the entire body of the if and else branches, so that they can just be swapped without relying on `ProcessedSource#ast_with_comments`.
|
Thanks for the review @koic! |
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, when swapping the
ifandelsebranches, if one of the branches only had a single statement, the branch would end up not being spaced out properly.Additionally, when there is a node with a comment inside the
ifthat has an identical node with a comment before theifstatement,CommentsHelp.begin_pos_with_commentreturns an incorrect range, which was causing a clobbering error. I fixed this by creating ranges of the entire body of the if and else branches, so that they can just be swapped without relying onProcessedSource#ast_with_comments. See rubocop/rubocop-ast#179.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 runs RuboCop on its own code.{change_type}_{change_description}.mdif the new code introduces user-observable changes. See changelog entry format for details.