[Fix #4444] Fix Style/AutoResourceCleanup shouldn't flag `File.open…

…(...).close (#5186)
rubocop · Dec 21, 2017 · 78d70ca · 78d70ca
1 parent b6d3cfe
commit 78d70ca
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * [#5226](https://github.com/bbatsov/rubocop/issues/5226): Suppress false positives for `Rails/RedundantReceiverInWithOptions` when including another receiver in `with_options`. ([@wata727][])
 * [#5238](https://github.com/bbatsov/rubocop/pull/5238): Fix error when #present? or #blank? is used in if or unless modifier. ([@eitoball][])
 * [#5261](https://github.com/bbatsov/rubocop/issues/5261): Fix a false positive for `Style/MixinUsage` when using inside class or module. ([@koic][])
+* [#4444](https://github.com/bbatsov/rubocop/issues/4444): Fix `Style/AutoResourceCleanup` shouldn't flag `File.open(...).close. ([@dpostorivo][])
 * [#5278](https://github.com/bbatsov/rubocop/pull/5278): Fix deprecation check to use `loaded_path` in warning. ([@chrishulton][])
 
 ### Changes

diff --git a/lib/rubocop/cop/style/auto_resource_cleanup.rb b/lib/rubocop/cop/style/auto_resource_cleanup.rb
@@ -29,15 +29,22 @@ def on_send(node)
 
             next if node.receiver != target_receiver
             next if node.method_name != target_method
-            next if node.parent && node.parent.block_type?
-            next if node.block_argument?
+            next if cleanup?(node)
 
             add_offense(node,
                         message: format(MSG,
                                         class: target_class,
                                         method: target_method))
           end
         end
+
+        private
+
+        def cleanup?(node)
+          parent = node.parent
+          node.block_argument? ||
+            (parent && (parent.block_type? || !parent.lvasgn_type?))
+        end
       end
     end
   end

diff --git a/spec/rubocop/cop/style/auto_resource_cleanup_spec.rb b/spec/rubocop/cop/style/auto_resource_cleanup_spec.rb
@@ -17,4 +17,8 @@
   it 'does not register an offense for File.open with block-pass' do
     expect_no_offenses('File.open("file", &:read)')
   end
+
+  it 'does not register an offense for File.open with immediate close' do
+    expect_no_offenses('File.open("file", "w", 0o777).close')
+  end
 end