Fix Style/RedundantReturn cop for empty if body

Neodelf · Oct 15, 2016 · 0a724b7 · 0a724b7
1 parent 58c458b
commit 0a724b7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+### Bug fixes
+
+* [#3607](https://github.com/bbatsov/rubocop/pull/3607): Fix `Style/RedundantReturn` cop for empty if body. ([@pocke][])
+
 ## 0.44.1 (2016-10-13)
 
 ### Bugs fixed

diff --git a/lib/rubocop/cop/style/redundant_return.rb b/lib/rubocop/cop/style/redundant_return.rb
@@ -106,7 +106,7 @@ def check_if_node(node)
           return if modifier_if?(node) || ternary?(node)
 
           _cond, if_node, else_node = if_node_parts(node)
-          check_branch(if_node)
+          check_branch(if_node) if if_node
           check_branch(else_node) if else_node
         end
 

diff --git a/spec/rubocop/cop/style/redundant_return_spec.rb b/spec/rubocop/cop/style/redundant_return_spec.rb
@@ -57,6 +57,17 @@
     expect(cop.offenses).to be_empty
   end
 
+  it 'does not blow up on empty if body' do
+    src = ['def func',
+           '  if x',
+           '  elsif y',
+           '  else',
+           '  end',
+           'end']
+    inspect_source(cop, src)
+    expect(cop.offenses).to be_empty
+  end
+
   it 'auto-corrects by removing redundant returns' do
     src = ['def func',
            '  one',