Merge pull request #49 from dduugg/fix-regexp_match-falfe-positive

[Fix #48] Fix RegexpMatch false positive
rubocop · May 10, 2019 · 9ee61d2 · 9ee61d2
2 parents c0ce42b + 1c61089
commit 9ee61d2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+### Bug fixes
+
+* [#48](https://github.com/rubocop-hq/rubocop-performance/issues/48): Reduce `Performance/RegexpMatch` false positive by only flagging `match` used with Regexp/String/Symbol literals. ([@dduugg][])
+
 ### Changes
 
 * [#52](https://github.com/rubocop-hq/rubocop-performance/issues/52): Drop support for Ruby 2.2. ([@bquorning][])
@@ -10,7 +14,7 @@
 
 ### Bug fixes
 
-* [#47](https://github.com/rubocop-hq/rubocop-performance/pull/47): Fix a false negartive for `Performance/RegexpMatch` when using RuboCop 0.68 or higher. ([@koic][])
+* [#47](https://github.com/rubocop-hq/rubocop-performance/pull/47): Fix a false negative for `Performance/RegexpMatch` when using RuboCop 0.68 or higher. ([@koic][])
 
 ## 1.1.0 (2019-04-08)
 
@@ -28,3 +32,4 @@
 [@composerinteralia]: https://github.com/composerinteralia
 [@koic]: https://github.com/koic
 [@bquorning]: https://github.com/bquorning
+[@dduugg]: https://github.com/dduugg
diff --git a/lib/rubocop/cop/performance/regexp_match.rb b/lib/rubocop/cop/performance/regexp_match.rb
@@ -80,14 +80,14 @@ class RegexpMatch < Cop
         # Constants are included in this list because it is unlikely that
         # someone will store `nil` as a constant and then use it for comparison
         TYPES_IMPLEMENTING_MATCH = %i[const regexp str sym].freeze
-        MSG =
-          'Use `match?` instead of `%<current>s` when `MatchData` ' \
+        MSG = 'Use `match?` instead of `%<current>s` when `MatchData` ' \
           'is not used.'
 
         def_node_matcher :match_method?, <<-PATTERN
           {
             (send _recv :match _ <int ...>)
-            (send _recv :match _)
+            (send _recv :match {regexp str sym})
+            (send {regexp str sym} :match _)
           }
         PATTERN
 

diff --git a/spec/rubocop/cop/performance/regexp_match_spec.rb b/spec/rubocop/cop/performance/regexp_match_spec.rb
@@ -381,5 +381,13 @@ def foo
         end
       RUBY
     end
+
+    it 'accepts match without explicit regexp/str/sym use' do
+      expect_no_offenses(<<-RUBY)
+        if CONST.match(var)
+          do_something
+        end
+      RUBY
+    end
   end
 end