Make some cops aware of safe navigation operator

Fixes rubocop#1191, rubocop#1192, rubocop#1193, rubocop#1194, rubocop#1196, rubocop#1197, rubocop#1201, and rubocop#1202.

This PR makes `Rails/ActiveSupportAliases`, `Rails/FindBy`, `Rails/FindById`, `Rails/Inquiry`,
`Rails/Pick` `Rails/PluckId`, `Rails/PluckInWhere`, `Rails/WhereEquals`, `Rails/WhereExists`,
and `Rails/WhereNot` cops aware of safe navigation operator.

changelog/fixmake_some_cops_aware_of_safe_navigation_operator.md

@@ -0,0 +1 @@
+* [#1204](https://github.com/rubocop/rubocop-rails/pull/1204): Make `Rails/ActiveSupportAliases`, `Rails/FindBy`, `Rails/FindById`, `Rails/Inquiry`, `Rails/Pick` `Rails/PluckId`, `Rails/PluckInWhere`, `Rails/WhereEquals`, `Rails/WhereExists`, and `Rails/WhereNot` cops aware of safe navigation operator. ([@koic][])

lib/rubocop/cop/mixin/active_record_helper.rb

@@ -98,7 +98,7 @@ def polymorphic?(belongs_to)
       end
 
       def in_where?(node)
-        send_node = node.each_ancestor(:send).first
+        send_node = node.each_ancestor(:send, :csend).first
         send_node && WHERE_METHODS.include?(send_node.method_name)
       end
     end

lib/rubocop/cop/rails/active_support_aliases.rb

@@ -27,13 +27,13 @@ class ActiveSupportAliases < Base
 
         ALIASES = {
           starts_with?: {
-            original: :start_with?, matcher: '(send str :starts_with? _)'
+            original: :start_with?, matcher: '(call str :starts_with? _)'
           },
           ends_with?: {
-            original: :end_with?, matcher: '(send str :ends_with? _)'
+            original: :end_with?, matcher: '(call str :ends_with? _)'
           },
-          append: { original: :<<, matcher: '(send array :append _)' },
-          prepend: { original: :unshift, matcher: '(send array :prepend _)' }
+          append: { original: :<<, matcher: '(call array :append _)' },
+          prepend: { original: :unshift, matcher: '(call array :prepend _)' }
         }.freeze
 
         ALIASES.each do |aliased_method, options|
@@ -47,13 +47,14 @@ def on_send(node)
             preferred_method = ALIASES[aliased_method][:original]
             message = format(MSG, prefer: preferred_method, current: aliased_method)
 
-            add_offense(node, message: message) do |corrector|
+            add_offense(node.loc.selector.join(node.source_range.end), message: message) do |corrector|
               next if append(node)
 
               corrector.replace(node.loc.selector, preferred_method)
             end
           end
         end
+        alias on_csend on_send
       end
     end
   end

lib/rubocop/cop/rails/find_by.rb

@@ -28,7 +28,7 @@ class FindBy < Base
         include RangeHelp
         extend AutoCorrector
 
-        MSG = 'Use `find_by` instead of `where.%<method>s`.'
+        MSG = 'Use `find_by` instead of `where%<dot>s%<method>s`.'
         RESTRICT_ON_SEND = %i[first take].freeze
 
         def on_send(node)
@@ -37,7 +37,7 @@ def on_send(node)
 
           range = offense_range(node)
 
-          add_offense(range, message: format(MSG, method: node.method_name)) do |corrector|
+          add_offense(range, message: format(MSG, dot: node.loc.dot.source, method: node.method_name)) do |corrector|
             autocorrect(corrector, node)
           end
         end

lib/rubocop/cop/rails/find_by_id.rb

@@ -24,40 +24,39 @@ class FindById < Base
         RESTRICT_ON_SEND = %i[take! find_by_id! find_by!].freeze
 
         def_node_matcher :where_take?, <<~PATTERN
-          (send
-            $(send _ :where
+          (call
+            $(call _ :where
               (hash
                 (pair (sym :id) $_))) :take!)
         PATTERN
 
         def_node_matcher :find_by?, <<~PATTERN
           {
-            (send _ :find_by_id! $_)
-            (send _ :find_by! (hash (pair (sym :id) $_)))
+            (call _ :find_by_id! $_)
+            (call _ :find_by! (hash (pair (sym :id) $_)))
           }
         PATTERN
 
         def on_send(node)
           where_take?(node) do |where, id_value|
             range = where_take_offense_range(node, where)
-            bad_method = build_where_take_bad_method(id_value)
 
-            register_offense(range, id_value, bad_method)
+            register_offense(range, id_value)
           end
 
           find_by?(node) do |id_value|
             range = find_by_offense_range(node)
-            bad_method = build_find_by_bad_method(node, id_value)
 
-            register_offense(range, id_value, bad_method)
+            register_offense(range, id_value)
           end
         end
+        alias on_csend on_send
 
         private
 
-        def register_offense(range, id_value, bad_method)
+        def register_offense(range, id_value)
           good_method = build_good_method(id_value)
-          message = format(MSG, good_method: good_method, bad_method: bad_method)
+          message = format(MSG, good_method: good_method, bad_method: range.source)
 
           add_offense(range, message: message) do |corrector|
             corrector.replace(range, good_method)
@@ -75,19 +74,6 @@ def find_by_offense_range(node)
         def build_good_method(id_value)
           "find(#{id_value.source})"
         end
-
-        def build_where_take_bad_method(id_value)
-          "where(id: #{id_value.source}).take!"
-        end
-
-        def build_find_by_bad_method(node, id_value)
-          case node.method_name
-          when :find_by_id!
-            "find_by_id!(#{id_value.source})"
-          when :find_by!
-            "find_by!(id: #{id_value.source})"
-          end
-        end
       end
     end
   end

lib/rubocop/cop/rails/inquiry.rb

@@ -33,6 +33,7 @@ def on_send(node)
 
           add_offense(node.loc.selector)
         end
+        alias on_csend on_send
       end
     end
   end

lib/rubocop/cop/rails/pick.rb

@@ -28,13 +28,13 @@ class Pick < Base
         extend AutoCorrector
         extend TargetRailsVersion
 
-        MSG = 'Prefer `pick(%<args>s)` over `pluck(%<args>s).first`.'
+        MSG = 'Prefer `pick(%<args>s)` over `%<current>s`.'
         RESTRICT_ON_SEND = %i[first].freeze
 
         minimum_target_rails_version 6.0
 
         def_node_matcher :pick_candidate?, <<~PATTERN
-          (send (send _ :pluck ...) :first)
+          (call (call _ :pluck ...) :first)
         PATTERN
 
         def on_send(node)
@@ -44,19 +44,20 @@ def on_send(node)
             node_selector = node.loc.selector
             range = receiver_selector.join(node_selector)
 
-            add_offense(range, message: message(receiver)) do |corrector|
+            add_offense(range, message: message(receiver, range)) do |corrector|
               first_range = receiver.source_range.end.join(node_selector)
 
               corrector.remove(first_range)
               corrector.replace(receiver_selector, 'pick')
             end
           end
         end
+        alias on_csend on_send
 
         private
 
-        def message(receiver)
-          format(MSG, args: receiver.arguments.map(&:source).join(', '))
+        def message(receiver, current)
+          format(MSG, args: receiver.arguments.map(&:source).join(', '), current: current.source)
         end
       end
     end

lib/rubocop/cop/rails/pluck_id.rb

@@ -34,7 +34,7 @@ class PluckId < Base
         RESTRICT_ON_SEND = %i[pluck].freeze
 
         def_node_matcher :pluck_id_call?, <<~PATTERN
-          (send _ :pluck {(sym :id) (send nil? :primary_key)})
+          (call _ :pluck {(sym :id) (send nil? :primary_key)})
         PATTERN
 
         def on_send(node)
@@ -47,6 +47,7 @@ def on_send(node)
             corrector.replace(offense_range(node), 'ids')
           end
         end
+        alias on_csend on_send
 
         private
 

lib/rubocop/cop/rails/pluck_in_where.rb

@@ -53,13 +53,14 @@ def on_send(node)
             corrector.replace(range, 'select')
           end
         end
+        alias on_csend on_send
 
         private
 
         def root_receiver(node)
           receiver = node.receiver
 
-          if receiver&.send_type?
+          if receiver&.call_type?
             root_receiver(receiver)
           else
             receiver

lib/rubocop/cop/rails/where_equals.rb

@@ -33,8 +33,8 @@ class WhereEquals < Base
 
         def_node_matcher :where_method_call?, <<~PATTERN
           {
-            (send _ :where (array $str_type? $_ ?))
-            (send _ :where $str_type? $_ ?)
+            (call _ :where (array $str_type? $_ ?))
+            (call _ :where $str_type? $_ ?)
           }
         PATTERN
 
@@ -55,6 +55,7 @@ def on_send(node)
             end
           end
         end
+        alias on_csend on_send
 
         EQ_ANONYMOUS_RE = /\A([\w.]+)\s+=\s+\?\z/.freeze             # column = ?
         IN_ANONYMOUS_RE = /\A([\w.]+)\s+IN\s+\(\?\)\z/i.freeze       # column IN (?)

lib/rubocop/cop/rails/where_exists.rb

@@ -55,11 +55,11 @@ class WhereExists < Base
         RESTRICT_ON_SEND = %i[exists?].freeze
 
         def_node_matcher :where_exists_call?, <<~PATTERN
-          (send (send _ :where $...) :exists?)
+          (call (call _ :where $...) :exists?)
         PATTERN
 
         def_node_matcher :exists_with_args?, <<~PATTERN
-          (send _ :exists? $...)
+          (call _ :exists? $...)
         PATTERN
 
         def on_send(node)
@@ -75,6 +75,7 @@ def on_send(node)
             end
           end
         end
+        alias on_csend on_send
 
         private
 

lib/rubocop/cop/rails/where_not.rb

@@ -32,8 +32,8 @@ class WhereNot < Base
 
         def_node_matcher :where_method_call?, <<~PATTERN
           {
-            (send _ :where (array $str_type? $_ ?))
-            (send _ :where $str_type? $_ ?)
+            (call _ :where (array $str_type? $_ ?))
+            (call _ :where $str_type? $_ ?)
           }
         PATTERN
 
@@ -54,6 +54,7 @@ def on_send(node)
             end
           end
         end
+        alias on_csend on_send
 
         NOT_EQ_ANONYMOUS_RE = /\A([\w.]+)\s+(?:!=|<>)\s+\?\z/.freeze           # column != ?, column <> ?
         NOT_IN_ANONYMOUS_RE = /\A([\w.]+)\s+NOT\s+IN\s+\(\?\)\z/i.freeze       # column NOT IN (?)

spec/rubocop/cop/rails/active_support_aliases_spec.rb

@@ -6,7 +6,7 @@
       it 'registers as an offense and corrects' do
         expect_offense(<<~RUBY)
           'some_string'.starts_with?('prefix')
-          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `start_with?` instead of `starts_with?`.
+                        ^^^^^^^^^^^^^^^^^^^^^^ Use `start_with?` instead of `starts_with?`.
         RUBY
 
         expect_correction(<<~RUBY)
@@ -15,6 +15,19 @@
       end
     end
 
+    describe '&.starts_with?' do
+      it 'registers as an offense and corrects' do
+        expect_offense(<<~RUBY)
+          'some_string'&.starts_with?('prefix')
+                         ^^^^^^^^^^^^^^^^^^^^^^ Use `start_with?` instead of `starts_with?`.
+        RUBY
+
+        expect_correction(<<~RUBY)
+          'some_string'&.start_with?('prefix')
+        RUBY
+      end
+    end
+
     describe '#start_with?' do
       it 'is not registered as an offense' do
         expect_no_offenses("'some_string'.start_with?('prefix')")
@@ -25,7 +38,7 @@
       it 'registers as an offense and corrects' do
         expect_offense(<<~RUBY)
           'some_string'.ends_with?('prefix')
-          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `end_with?` instead of `ends_with?`.
+                        ^^^^^^^^^^^^^^^^^^^^ Use `end_with?` instead of `ends_with?`.
         RUBY
 
         expect_correction(<<~RUBY)
@@ -34,6 +47,19 @@
       end
     end
 
+    describe '&ends_with?' do
+      it 'registers as an offense and corrects' do
+        expect_offense(<<~RUBY)
+          'some_string'&.ends_with?('prefix')
+                         ^^^^^^^^^^^^^^^^^^^^ Use `end_with?` instead of `ends_with?`.
+        RUBY
+
+        expect_correction(<<~RUBY)
+          'some_string'&.end_with?('prefix')
+        RUBY
+      end
+    end
+
     describe '#end_with?' do
       it 'is not registered as an offense' do
         expect_no_offenses("'some_string'.end_with?('prefix')")
@@ -46,7 +72,18 @@
       it 'registers as an offense and does not correct' do
         expect_offense(<<~RUBY)
           [1, 'a', 3].append('element')
-          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `<<` instead of `append`.
+                      ^^^^^^^^^^^^^^^^^ Use `<<` instead of `append`.
+        RUBY
+
+        expect_no_corrections
+      end
+    end
+
+    describe '&.append' do
+      it 'registers as an offense and does not correct' do
+        expect_offense(<<~RUBY)
+          [1, 'a', 3]&.append('element')
+                       ^^^^^^^^^^^^^^^^^ Use `<<` instead of `append`.
         RUBY
 
         expect_no_corrections
@@ -63,7 +100,7 @@
       it 'registers as an offense and corrects' do
         expect_offense(<<~RUBY)
           [1, 'a', 3].prepend('element')
-          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `unshift` instead of `prepend`.
+                      ^^^^^^^^^^^^^^^^^^ Use `unshift` instead of `prepend`.
         RUBY
 
         expect_correction(<<~RUBY)
@@ -72,6 +109,19 @@
       end
     end
 
+    describe '&.prepend' do
+      it 'registers as an offense and corrects' do
+        expect_offense(<<~RUBY)
+          [1, 'a', 3]&.prepend('element')
+                       ^^^^^^^^^^^^^^^^^^ Use `unshift` instead of `prepend`.
+        RUBY
+
+        expect_correction(<<~RUBY)
+          [1, 'a', 3]&.unshift('element')
+        RUBY
+      end
+    end
+
     describe '#unshift' do
       it 'is not registered as an offense' do
         expect_no_offenses("[1, 'a', 3].unshift('element')")