Teach Performance/{Start, End}With cops to look for Regexp#match?

eugeneius · Oct 12, 2018 · 3027c87 · 3027c87
1 parent 2758fca
commit 3027c87
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/lib/rubocop/cop/performance/end_with.rb b/lib/rubocop/cop/performance/end_with.rb
@@ -8,6 +8,7 @@ module Performance
       #
       # @example
       #   # bad
+      #   'abc'.match?(/bc\Z/)
       #   'abc' =~ /bc\Z/
       #   'abc'.match(/bc\Z/)
       #
@@ -19,7 +20,7 @@ class EndWith < Cop
         SINGLE_QUOTE = "'".freeze
 
         def_node_matcher :redundant_regex?, <<-PATTERN
-          {(send $!nil? {:match :=~} (regexp (str $#literal_at_end?) (regopt)))
+          {(send $!nil? {:match :=~ :match?} (regexp (str $#literal_at_end?) (regopt)))
            (send (regexp (str $#literal_at_end?) (regopt)) {:match :=~} $_)}
         PATTERN
 

diff --git a/lib/rubocop/cop/performance/start_with.rb b/lib/rubocop/cop/performance/start_with.rb
@@ -8,6 +8,7 @@ module Performance
       #
       # @example
       #   # bad
+      #   'abc'.match?(/\Aab/)
       #   'abc' =~ /\Aab/
       #   'abc'.match(/\Aab/)
       #
@@ -19,7 +20,7 @@ class StartWith < Cop
         SINGLE_QUOTE = "'".freeze
 
         def_node_matcher :redundant_regex?, <<-PATTERN
-          {(send $!nil? {:match :=~} (regexp (str $#literal_at_start?) (regopt)))
+          {(send $!nil? {:match :=~ :match?} (regexp (str $#literal_at_start?) (regopt)))
            (send (regexp (str $#literal_at_start?) (regopt)) {:match :=~} $_)}
         PATTERN
 

diff --git a/spec/rubocop/cop/performance/end_with_spec.rb b/spec/rubocop/cop/performance/end_with_spec.rb
@@ -70,6 +70,7 @@
     end
   end
 
+  include_examples('different match methods', '.match?')
   include_examples('different match methods', ' =~')
   include_examples('different match methods', '.match')
 

diff --git a/spec/rubocop/cop/performance/start_with_spec.rb b/spec/rubocop/cop/performance/start_with_spec.rb
@@ -61,6 +61,7 @@
     end
   end
 
+  include_examples('different match methods', '.match?')
   include_examples('different match methods', ' =~')
   include_examples('different match methods', '.match')
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,6 +70,7 @@ @@
         end
       end
+      include_examples('different match methods', '.match?')
       include_examples('different match methods', ' =~')
       include_examples('different match methods', '.match')
@@ Expand Down @@