Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix #9953] Fix a false auto-correction behavior for Layout/EndAlignment #9960

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -0,0 +1 @@
* [#9953](https://github.com/rubocop/rubocop/issues/9953): Fix an infinite loop error and a false auto-correction behavior for `Layout/EndAlignment` when using a conditional statement in a method argument. ([@koic][])
3 changes: 2 additions & 1 deletion lib/rubocop/cop/layout/end_alignment.rb
Expand Up @@ -165,7 +165,8 @@ def alignment_node(node)
end

def alignment_node_for_variable_style(node)
return node.parent if node.case_type? && node.argument?
return node.parent if node.case_type? && node.argument? &&
node.loc.line == node.parent.loc.line

assignment = assignment_or_operator_method(node)

Expand Down
25 changes: 25 additions & 0 deletions spec/rubocop/cop/layout/end_alignment_spec.rb
Expand Up @@ -339,6 +339,31 @@ module Test
end
RUBY
end

it 'register an offense when using a conditional statement in a method argument and `end` is not aligned' do
expect_offense(<<~RUBY)
format(
case condition
when foo
bar
else
baz
end, qux
^^^ `end` at 7, 0 is not aligned with `case` at 2, 2.
)
RUBY

expect_correction(<<~RUBY)
format(
case condition
when foo
bar
else
baz
end, qux
)
RUBY
end
end

context 'correct + opposite' do
Expand Down