Fix a false negative for Lint/ElseLayout

Regression by 219dfe1. This PR fixes a false negative for `Lint/ElseLayout` when using multiple `elsif`s.
rubocop · Feb 12, 2021 · b2aa853 · b2aa853
1 parent b82c20f
commit b2aa853
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/changelog/fix_false_negative_for_lint_else_layout.md b/changelog/fix_false_negative_for_lint_else_layout.md
@@ -0,0 +1 @@
+* [#9511](https://github.com/rubocop-hq/rubocop/pull/9511): Fix a false negative for `Lint/ElseLayout` when using multiple `elsif`s. ([@koic][])
diff --git a/lib/rubocop/cop/lint/else_layout.rb b/lib/rubocop/cop/lint/else_layout.rb
@@ -47,7 +47,7 @@ class ElseLayout < Base
         MSG = 'Odd `else` layout detected. Did you mean to use `elsif`?'
 
         def on_if(node)
-          return if node.ternary? || node.elsif?
+          return if node.ternary?
 
           check(node)
         end

diff --git a/spec/rubocop/cop/lint/else_layout_spec.rb b/spec/rubocop/cop/lint/else_layout_spec.rb
@@ -69,6 +69,36 @@
     RUBY
   end
 
+  it 'registers and corrects an offense when using multiple `elsif`s' do
+    expect_offense(<<~RUBY)
+      if condition_foo
+        foo
+      elsif condition_bar
+        bar
+      elsif condition_baz
+        baz
+      else qux
+           ^^^ Odd `else` layout detected. Did you mean to use `elsif`?
+        quux
+        corge
+      end
+    RUBY
+
+    expect_correction(<<~RUBY)
+      if condition_foo
+        foo
+      elsif condition_bar
+        bar
+      elsif condition_baz
+        baz
+      else
+        qux
+        quux
+        corge
+      end
+    RUBY
+  end
+
   it 'handles ternary ops' do
     expect_no_offenses('x ? a : b')
   end