Merge pull request rubocop#2220 from lumeet/2217_symbol_proc_block_args

bbatsov · bbatsov · commit 6a263d50701e · 2015-09-06T10:34:47.000+03:00
[Fix rubocop#2217] Allow block arguments in SymbolProc
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Bug Fixes
 
 * [#2214](https://github.com/bbatsov/rubocop/pull/2214): Fix `File name too long error` when `STDIN` option is provided. ([@mrfoto][])
+* [#2217](https://github.com/bbatsov/rubocop/issues/2217): Allow block arguments in `Style/SymbolProc`. ([@lumeet][])
 
 ## 0.34.0 (05/09/2015)
 
diff --git a/lib/rubocop/cop/style/symbol_proc.rb b/lib/rubocop/cop/style/symbol_proc.rb
@@ -103,6 +103,7 @@ def ignored_method?(name)
         def can_shorten?(block_args, block_body)
           # something { |x, y| ... }
           return false unless block_args.children.size == 1
+          return false if block_args.children.first.blockarg_type?
           return false unless block_body && block_body.type == :send
 
           receiver, _method_name, args = *block_body
diff --git a/spec/rubocop/cop/style/symbol_proc_spec.rb b/spec/rubocop/cop/style/symbol_proc_spec.rb
@@ -76,6 +76,12 @@
     expect(cop.offenses).to be_empty
   end
 
+  it 'accepts block with a block argument ' do
+    inspect_source(cop, 'something { |&x| x.call }')
+
+    expect(cop.offenses).to be_empty
+  end
+
   context 'when the method has arguments' do
     let(:source) { 'method(one, 2) { |x| x.test }' }
 
