rubocop-performance 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b4e37268b335dd810db8ddf3b71bde2de0961faff6f01762c4462e545b31b5c
-  data.tar.gz: e12f8f66c38d0aedec5602fb812818385a1d540a272a7df3f0e5ac79117a0fe9
+  metadata.gz: c7ae023c81bdf2e4816ffa5bed9a98fc10bcaec5e6e37c89f51eb9fb11fa452f
+  data.tar.gz: 01bc8929e0c9ab2d80933c13c35dbcc713a04574ff51002ff2f7182e05045917
 SHA512:
-  metadata.gz: 45c31b5a12937ebcae1cf78f4b9ddf21891a07f3fdeb7ff5077ae4b25338df7ef82807ece0c4663edc2b802b5441c7e35ebe5e9ae6f2472b292ea5c60ab11dc8
-  data.tar.gz: 2640dc57af12939b4563c7bc4235a0d0668cc7a129a9ac77a3a40cc01e53c22f72d1027b0f998a93551aa4c0af7b0e0a9eaf7e8921153b88bb647e289d2b651a
+  metadata.gz: 05da6b08dea1f6b8f16aa077bbfaa021b9586efb6895452f6af465fa03f695740370d8eb126d467c79565c204a2d76125fd0ce6137b9e18bb3dbe47d6c9ed44d
+  data.tar.gz: b0c11d70c9677b6e7e8796523b602a7dfe8ed308dfe124b26a4935193eee4293f5147cdd198b2a277841ccea131dde686c0be965811659cb030b16e3a0841b68

data/lib/rubocop/cop/performance/redundant_merge.rb

@@ -132,7 +132,7 @@ module RuboCop
         end
 
         def max_key_value_pairs
-          Integer(cop_config['MaxKeyValuePairs'])
+          Integer(cop_config['MaxKeyValuePairs']) || 2
         end
 
         # A utility class for checking the use of values within an

data/lib/rubocop/cop/performance/regexp_match.rb

@@ -177,25 +177,42 @@ module RuboCop
           scope_root = scope_root(match_node)
           body = scope_root ? scope_body(scope_root) : match_node.ancestors.last
 
-          return true if match_node.parent.if_type? &&
-                         match_node.parent.modifier_form?
+          range = range_to_search_for_last_matches(match_node, body, scope_root)
 
-          match_node_pos = match_node.loc.expression.begin_pos
+          find_last_match(body, range, scope_root)
+        end
 
+        def range_to_search_for_last_matches(match_node, body, scope_root)
+          expression = if modifier_form?(match_node)
+                         match_node.parent.if_branch.loc.expression
+                       else
+                         match_node.loc.expression
+                       end
+
+          match_node_pos = expression.begin_pos
           next_match_pos = next_match_pos(body, match_node_pos, scope_root)
-          range = match_node_pos..next_match_pos
 
-          find_last_match(body, range, scope_root)
+          match_node_pos..next_match_pos
         end
 
         def next_match_pos(body, match_node_pos, scope_root)
           node = search_match_nodes(body).find do |match|
-            match.loc.expression.begin_pos > match_node_pos &&
-              scope_root(match) == scope_root
+            begin_pos = if modifier_form?(match)
+                          match.parent.if_branch.loc.expression.begin_pos
+                        else
+                          match.loc.expression.begin_pos
+                        end
+
+            begin_pos > match_node_pos && scope_root(match) == scope_root
           end
+
           node ? node.loc.expression.begin_pos : Float::INFINITY
         end
 
+        def modifier_form?(match_node)
+          match_node.parent.if_type? && match_node.parent.modifier_form?
+        end
+
         def find_last_match(body, range, scope_root)
           last_matches(body).find do |ref|
             ref_pos = ref.loc.expression.begin_pos

data/lib/rubocop/cop/performance_cops.rb

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-module RuboCop
-  # RuboCop included the performance cops directly before version 1.0.0.
-  # We can remove them to avoid warnings about redefining constants.
-  module Cop
-    remove_const('Performance') if const_defined?('Performance')
-  end
-end
-
 require_relative 'performance/caller'
 require_relative 'performance/case_when_splat'
 require_relative 'performance/casecmp'

data/lib/rubocop/performance/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Performance
     module Version
-      STRING = '1.4.0'
+      STRING = '1.4.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-performance
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop