Fix false negative for Layout/SpaceAroundBlockParameters

rubocop · Mar 2, 2019 · 9612547 · 9612547
1 parent ae6a799
commit 9612547
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * [#6777](https://github.com/rubocop-hq/rubocop/issues/6777): Fix a false positive for `Style/TrivialAccessors` when using trivial reader/writer methods at the top level. ([@koic][])
 * [#6799](https://github.com/rubocop-hq/rubocop/pull/6799): Fix errors for `Style/ConditionalAssignment`, `Style/IdenticalConditionalBranches`, `Lint/ElseLayout`, and `Layout/IndentationWidth` with empty braces. ([@pocke][])
 * [#6802](https://github.com/rubocop-hq/rubocop/pull/6802): Fix auto-correction for `Style/SymbolArray` with array contains interpolation when `EnforcedStyle` is `brackets`. ([@pocke][])
+* [#6797](https://github.com/rubocop-hq/rubocop/pull/6797): Fix false negative for Layout/SpaceAroundBlockParameters on block parameter with parens. ([@pocke][])
 
 ### Changes
 

diff --git a/lib/rubocop/cop/layout/space_around_block_parameters.rb b/lib/rubocop/cop/layout/space_around_block_parameters.rb
@@ -120,16 +120,22 @@ def last_end_pos_inside_pipes(pos)
         end
 
         def check_each_arg(args)
-          args.children.butfirst.each do |arg|
-            expr = arg.source_range
-            check_no_space(
-              range_with_surrounding_space(range: expr, side: :left).begin_pos,
-              expr.begin_pos - 1,
-              'Extra space before'
-            )
+          args.children.each do |arg|
+            check_arg(arg)
           end
         end
 
+        def check_arg(arg)
+          arg.children.each { |a| check_arg(a) } if arg.mlhs_type?
+
+          expr = arg.source_range
+          check_no_space(
+            range_with_surrounding_space(range: expr, side: :left).begin_pos,
+            expr.begin_pos - 1,
+            'Extra space before'
+          )
+        end
+
         def check_space(space_begin_pos, space_end_pos, range, msg)
           return if space_begin_pos != space_end_pos
 

diff --git a/spec/rubocop/cop/layout/space_around_block_parameters_spec.rb b/spec/rubocop/cop/layout/space_around_block_parameters_spec.rb
@@ -89,6 +89,15 @@
       RUBY
     end
 
+    it 'registers an offense for space with parens' do
+      expect_offense(<<-RUBY.strip_indent)
+        {}.each { |a,  (x,  y),  z| puts x }
+                     ^ Extra space before block parameter detected.
+                          ^ Extra space before block parameter detected.
+                               ^ Extra space before block parameter detected.
+      RUBY
+    end
+
     context 'trailing comma' do
       it 'registers an offense for space after the last comma' do
         expect_offense(<<-RUBY.strip_indent)
@@ -215,6 +224,16 @@
       RUBY
     end
 
+    it 'registers an offense for space with parens at middle' do
+      expect_offense(<<-RUBY.strip_indent)
+        {}.each { |(x,  y),  z| puts x }
+                   ^^^^^^^ Space before first block parameter missing.
+                      ^ Extra space before block parameter detected.
+                           ^ Extra space before block parameter detected.
+                             ^ Space after last block parameter missing.
+      RUBY
+    end
+
     context 'trailing comma' do
       it 'accepts space after the last comma' do
         expect_no_offenses('{}.each { | x, | puts x }')