Use first_argument instead of first_argument_range

The standard `first_argument` method is simpler. And this commit removes private API `first_argument_range`.
rubocop · Mar 28, 2023 · e970d41 · e970d41
1 parent 18e39e9
commit e970d41
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/lib/rubocop/cop/minitest/refute_equal.rb b/lib/rubocop/cop/minitest/refute_equal.rb
@@ -36,7 +36,7 @@ def on_send(node)
               corrector.replace(node.loc.selector, 'refute_equal')
 
               replacement = [expected, actual].map(&:source).join(', ')
-              corrector.replace(first_argument_range(node), replacement)
+              corrector.replace(node.first_argument, replacement)
             end
           end
         end

diff --git a/lib/rubocop/cop/minitest/refute_false.rb b/lib/rubocop/cop/minitest/refute_false.rb
@@ -66,7 +66,7 @@ def autocorrect(corrector, node, actual)
           if node.method?(:assert_equal)
             corrector.replace(first_and_second_arguments_range(node), actual.source)
           else
-            corrector.replace(first_argument_range(node), actual.source)
+            corrector.replace(node.first_argument, actual.source)
           end
         end
       end

diff --git a/lib/rubocop/cop/mixin/argument_range_helper.rb b/lib/rubocop/cop/mixin/argument_range_helper.rb
@@ -9,12 +9,6 @@ module ArgumentRangeHelper
 
       private
 
-      def first_argument_range(node)
-        first_argument = node.first_argument
-
-        range_between(first_argument.source_range.begin_pos, first_argument.source_range.end_pos)
-      end
-
       def first_and_second_arguments_range(node)
         first_argument = node.first_argument
         second_argument = node.arguments[1]

diff --git a/lib/rubocop/cop/mixin/minitest_cop_rule.rb b/lib/rubocop/cop/mixin/minitest_cop_rule.rb
@@ -64,7 +64,7 @@ def autocorrect(corrector, node, arguments)
               new_arguments = '(' + new_arguments + ')'
             end
 
-            corrector.replace(first_argument_range(node), new_arguments)
+            corrector.replace(node.first_argument, new_arguments)
           end
 
           private

diff --git a/lib/rubocop/cop/mixin/predicate_assertion_handleable.rb b/lib/rubocop/cop/mixin/predicate_assertion_handleable.rb
@@ -28,7 +28,7 @@ def autocorrect(corrector, node, arguments)
 
           new_arguments = new_arguments(arguments).join(', ')
 
-          corrector.replace(first_argument_range(node), new_arguments)
+          corrector.replace(node.first_argument, new_arguments)
         end
 
         private
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ def autocorrect(corrector, node, arguments) @@
                   new_arguments = '(' + new_arguments + ')'
                 end
-                corrector.replace(first_argument_range(node), new_arguments)
+                corrector.replace(node.first_argument, new_arguments)
               end
               private
@@ Expand Down @@