rubocop 0.81.0 → 0.82.0

data/lib/rubocop/cop/style/not.rb

@@ -69,7 +69,7 @@ module RuboCop
         def correct_with_parens(range, node)
           lambda do |corrector|
             corrector.replace(range, '!(')
-            corrector.insert_after(node.source_range, ')')
+            corrector.insert_after(node, ')')
           end
         end
 

data/lib/rubocop/cop/style/numeric_literal_prefix.rb

@@ -59,7 +59,7 @@ module RuboCop
         def autocorrect(node)
           lambda do |corrector|
             type = literal_type(node)
-            corrector.replace(node.source_range,
+            corrector.replace(node,
                               send(:"format_#{type}", node.source))
           end
         end

data/lib/rubocop/cop/style/numeric_literals.rb

@@ -48,7 +48,7 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            corrector.replace(node.source_range, format_number(node))
+            corrector.replace(node, format_number(node))
           end
         end
 

data/lib/rubocop/cop/style/numeric_predicate.rb

@@ -73,7 +73,7 @@ module RuboCop
           _, replacement = check(node)
 
           lambda do |corrector|
-            corrector.replace(node.loc.expression, replacement)
+            corrector.replace(node, replacement)
           end
         end
 

data/lib/rubocop/cop/style/one_line_conditional.rb

@@ -36,7 +36,7 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            corrector.replace(node.source_range, replacement(node))
+            corrector.replace(node, replacement(node))
           end
         end
 

data/lib/rubocop/cop/style/or_assignment.rb

@@ -69,7 +69,7 @@ module RuboCop
           end
 
           lambda do |corrector|
-            corrector.replace(node.source_range,
+            corrector.replace(node,
                               "#{variable} ||= #{default.source}")
           end
         end

data/lib/rubocop/cop/style/percent_q_literals.rb

@@ -39,7 +39,7 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            corrector.replace(node.source_range, corrected(node.source))
+            corrector.replace(node, corrected(node.source))
           end
         end
 

data/lib/rubocop/cop/style/perl_backrefs.rb

@@ -24,10 +24,10 @@ module RuboCop
             backref, = *node
             parent_type = node.parent ? node.parent.type : nil
             if %i[dstr xstr regexp].include?(parent_type)
-              corrector.replace(node.source_range,
+              corrector.replace(node,
                                 "{Regexp.last_match(#{backref})}")
             else
-              corrector.replace(node.source_range,
+              corrector.replace(node,
                                 "Regexp.last_match(#{backref})")
             end
           end

data/lib/rubocop/cop/style/proc.rb

@@ -26,7 +26,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          ->(corrector) { corrector.replace(node.source_range, 'proc') }
+          ->(corrector) { corrector.replace(node, 'proc') }
         end
       end
     end

data/lib/rubocop/cop/style/raise_args.rb

@@ -58,7 +58,7 @@ module RuboCop
                           correction_compact_to_exploded(node)
                         end
 
-          ->(corrector) { corrector.replace(node.source_range, replacement) }
+          ->(corrector) { corrector.replace(node, replacement) }
         end
 
         private

data/lib/rubocop/cop/style/random_with_offset.rb

@@ -66,13 +66,13 @@ module RuboCop
         def autocorrect(node)
           lambda do |corrector|
             if integer_op_rand?(node)
-              corrector.replace(node.source_range,
+              corrector.replace(node,
                                 corrected_integer_op_rand(node))
             elsif rand_op_integer?(node)
-              corrector.replace(node.source_range,
+              corrector.replace(node,
                                 corrected_rand_op_integer(node))
             elsif rand_modified?(node)
-              corrector.replace(node.source_range,
+              corrector.replace(node,
                                 corrected_rand_modified(node))
             end
           end

data/lib/rubocop/cop/style/redundant_condition.rb

@@ -48,11 +48,11 @@ module RuboCop
             if node.ternary?
               correct_ternary(corrector, node)
             elsif node.modifier_form? || !node.else_branch
-              corrector.replace(node.source_range, node.if_branch.source)
+              corrector.replace(node, node.if_branch.source)
             else
               corrected = make_ternary_form(node)
 
-              corrector.replace(node.source_range, corrected)
+              corrector.replace(node, corrected)
             end
           end
         end
@@ -116,8 +116,7 @@ module RuboCop
 
           return unless node.else_branch.range_type?
 
-          corrector.insert_before(node.else_branch.loc.expression, '(')
-          corrector.insert_after(node.else_branch.loc.expression, ')')
+          corrector.wrap(node.else_branch, '(', ')')
         end
       end
     end

data/lib/rubocop/cop/style/redundant_conditional.rb

@@ -40,7 +40,7 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            corrector.replace(node.loc.expression, replacement_condition(node))
+            corrector.replace(node, replacement_condition(node))
           end
         end
 

data/lib/rubocop/cop/style/redundant_exception.rb

@@ -32,17 +32,17 @@ module RuboCop
           exploded?(node) do |command, message|
             return lambda do |corrector|
               if node.parenthesized?
-                corrector.replace(node.source_range,
+                corrector.replace(node,
                                   "#{command}(#{message.source})")
               else
-                corrector.replace(node.source_range,
+                corrector.replace(node,
                                   "#{command} #{message.source}")
               end
             end
           end
           compact?(node) do |new_call, message|
             lambda do |corrector|
-              corrector.replace(new_call.source_range, message.source)
+              corrector.replace(new_call, message.source)
             end
           end
         end

data/lib/rubocop/cop/style/redundant_interpolation.rb

@@ -72,13 +72,13 @@ module RuboCop
 
         def autocorrect_variable_interpolation(embedded_node, node)
           replacement = "#{embedded_node.loc.expression.source}.to_s"
-          ->(corrector) { corrector.replace(node.loc.expression, replacement) }
+          ->(corrector) { corrector.replace(node, replacement) }
         end
 
         def autocorrect_single_variable_interpolation(embedded_node, node)
           variable_loc = embedded_node.children.first.loc
           replacement = "#{variable_loc.expression.source}.to_s"
-          ->(corrector) { corrector.replace(node.loc.expression, replacement) }
+          ->(corrector) { corrector.replace(node, replacement) }
         end
 
         def autocorrect_other(embedded_node, node)

data/lib/rubocop/cop/style/redundant_percent_q.rb

@@ -47,7 +47,7 @@ module RuboCop
 
         def autocorrect(node)
           delimiter =
-            node.source =~ /^%Q[^"]+$|'/ ? QUOTE : SINGLE_QUOTE
+            /^%Q[^"]+$|'/.match?(node.source) ? QUOTE : SINGLE_QUOTE
           lambda do |corrector|
             corrector.replace(node.loc.begin, delimiter)
             corrector.replace(node.loc.end, delimiter)
@@ -95,7 +95,7 @@ module RuboCop
         def acceptable_q?(node)
           src = node.source
 
-          return true if src =~ STRING_INTERPOLATION_REGEXP
+          return true if STRING_INTERPOLATION_REGEXP.match?(src)
 
           src.scan(/\\./).any? { |s| s =~ ESCAPED_NON_BACKSLASH }
         end

data/lib/rubocop/cop/style/redundant_return.rb

@@ -71,7 +71,7 @@ module RuboCop
         private
 
         def correct_without_arguments(return_node, corrector)
-          corrector.replace(return_node.source_range, 'nil')
+          corrector.replace(return_node, 'nil')
         end
 
         def correct_with_arguments(return_node, corrector)
@@ -91,15 +91,13 @@ module RuboCop
         end
 
         def add_brackets(corrector, node)
-          kids = node.children.map(&:source_range)
-          corrector.insert_before(kids.first, '[')
-          corrector.insert_after(kids.last, ']')
+          corrector.insert_before(node.children.first, '[')
+          corrector.insert_after(node.children.last, ']')
         end
 
         def add_braces(corrector, node)
-          kids = node.children.map(&:source_range)
-          corrector.insert_before(kids.first, '{')
-          corrector.insert_after(kids.last, '}')
+          corrector.insert_before(node.children.first, '{')
+          corrector.insert_after(node.children.last, '}')
         end
 
         # rubocop:disable Metrics/CyclomaticComplexity

data/lib/rubocop/cop/style/redundant_self.rb

@@ -110,7 +110,7 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            corrector.remove(node.receiver.source_range)
+            corrector.remove(node.receiver)
             corrector.remove(node.loc.dot)
           end
         end

data/lib/rubocop/cop/style/rescue_modifier.rb

@@ -64,7 +64,7 @@ module RuboCop
             "\n#{offset(node)}end"
 
           lambda do |corrector|
-            corrector.replace(node.source_range, correction)
+            corrector.replace(node, correction)
           end
         end
       end

data/lib/rubocop/cop/style/return_nil.rb

@@ -60,7 +60,7 @@ module RuboCop
         def autocorrect(node)
           lambda do |corrector|
             corrected = style == :return ? 'return' : 'return nil'
-            corrector.replace(node.source_range, corrected)
+            corrector.replace(node, corrected)
           end
         end
 

data/lib/rubocop/cop/style/safe_navigation.rb

@@ -131,7 +131,7 @@ module RuboCop
           comments = comments(node)
           return if comments.empty?
 
-          corrector.insert_before(method_call.loc.expression,
+          corrector.insert_before(method_call,
                                   "#{comments.map(&:text).join("\n")}\n")
         end
 

data/lib/rubocop/cop/style/self_assignment.rb

@@ -88,7 +88,7 @@ module RuboCop
         def apply_autocorrect(node, rhs, operator, new_rhs)
           lambda do |corrector|
             corrector.insert_before(node.loc.operator, operator)
-            corrector.replace(rhs.source_range, new_rhs.source)
+            corrector.replace(rhs, new_rhs.source)
           end
         end
       end

data/lib/rubocop/cop/style/special_global_vars.rb

@@ -145,7 +145,7 @@ module RuboCop
               node = node.parent
             end
 
-            corrector.replace(node.source_range, replacement(node, global_var))
+            corrector.replace(node, replacement(node, global_var))
           end
         end
 

data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb

@@ -57,10 +57,7 @@ module RuboCop
 
         def missing_parentheses_corrector(node)
           lambda do |corrector|
-            args_loc = node.loc.expression
-
-            corrector.insert_before(args_loc, '(')
-            corrector.insert_after(args_loc, ')')
+            corrector.wrap(node, '(', ')')
           end
         end
 

data/lib/rubocop/cop/style/string_hash_keys.rb

@@ -41,7 +41,7 @@ module RuboCop
         def autocorrect(node)
           lambda do |corrector|
             symbol_content = node.str_content.to_sym.inspect
-            corrector.replace(node.source_range, symbol_content)
+            corrector.replace(node, symbol_content)
           end
         end
       end

data/lib/rubocop/cop/style/symbol_array.rb

@@ -81,7 +81,7 @@ module RuboCop
           end
 
           lambda do |corrector|
-            corrector.replace(node.source_range, "[#{syms.join(', ')}]")
+            corrector.replace(node, "[#{syms.join(', ')}]")
           end
         end
 

data/lib/rubocop/cop/style/symbol_literal.rb

@@ -16,14 +16,14 @@ module RuboCop
         MSG = 'Do not use strings for word-like symbol literals.'
 
         def on_sym(node)
-          return unless node.source =~ /\A:["'][A-Za-z_]\w*["']\z/
+          return unless /\A:["'][A-Za-z_]\w*["']\z/.match?(node.source)
 
           add_offense(node)
         end
 
         def autocorrect(node)
           lambda do |corrector|
-            corrector.replace(node.source_range, node.source.delete(%q('")))
+            corrector.replace(node, node.source.delete(%q('")))
           end
         end
       end

data/lib/rubocop/cop/style/ternary_parentheses.rb

@@ -207,8 +207,7 @@ module RuboCop
 
         def correct_unparenthesized(condition)
           lambda do |corrector|
-            corrector.insert_before(condition.source_range, '(')
-            corrector.insert_after(condition.source_range, ')')
+            corrector.wrap(condition, '(', ')')
           end
         end
 

data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb

@@ -10,7 +10,8 @@ module RuboCop
       # for all parenthesized method calls with arguments.
       # - `comma`: Requires a comma after the last argument, but only for
       # parenthesized method calls where each argument is on its own line.
-      # - `no_comma`: Does not requires a comma after the last argument.
+      # - `no_comma`: Requires that there is no comma after the last
+      # argument.
       #
       # @example EnforcedStyleForMultiline: consistent_comma
       #   # bad

data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb

@@ -44,6 +44,9 @@ module RuboCop
         MSG = 'Useless trailing comma present in block arguments.'
 
         def on_block(node)
+          # lambda literal (`->`) never has block arguments.
+          return if node.send_node.lambda_literal?
+
           return unless useless_trailing_comma?(node)
 
           add_offense(node, location: last_comma(node).pos)

data/lib/rubocop/cop/style/trivial_accessors.rb

@@ -161,7 +161,7 @@ module RuboCop
           return unless names_match?(node) && !node.predicate_method? && kind
 
           lambda do |corrector|
-            corrector.replace(node.source_range,
+            corrector.replace(node,
                               accessor(kind, node.method_name))
           end
         end

data/lib/rubocop/cop/style/unpack_first.rb

@@ -18,10 +18,6 @@ module RuboCop
       #   'foo'.unpack1('h*')
       #
       class UnpackFirst < Cop
-        extend TargetRubyVersion
-
-        minimum_target_ruby_version 2.4
-
         MSG = 'Use `%<receiver>s.unpack1(%<format>s)` instead of '\
           '`%<receiver>s.unpack(%<format>s)%<method>s`.'
 

data/lib/rubocop/cop/style/variable_interpolation.rb

@@ -29,7 +29,7 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            corrector.replace(node.source_range, "{#{node.source}}")
+            corrector.replace(node, "{#{node.source}}")
           end
         end
 

data/lib/rubocop/cop/style/while_until_modifier.rb

@@ -43,7 +43,7 @@ module RuboCop
                     "#{node.condition.source}"
 
           lambda do |corrector|
-            corrector.replace(node.source_range, oneline)
+            corrector.replace(node, oneline)
           end
         end
 

data/lib/rubocop/cop/style/word_array.rb

@@ -93,7 +93,7 @@ module RuboCop
           end
 
           lambda do |corrector|
-            corrector.replace(node.source_range, "[#{words.join(', ')}]")
+            corrector.replace(node, "[#{words.join(', ')}]")
           end
         end
       end

data/lib/rubocop/cop/style/zero_length_predicate.rb

@@ -37,7 +37,7 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            corrector.replace(node.loc.expression, replacement(node))
+            corrector.replace(node, replacement(node))
           end
         end
 

data/lib/rubocop/formatter/formatter_set.rb

@@ -11,7 +11,6 @@ module RuboCop
       BUILTIN_FORMATTERS_FOR_KEYS = {
         '[a]utogenconf' => AutoGenConfigFormatter,
         '[c]lang'       => ClangStyleFormatter,
-        '[d]isabled'    => DisabledLinesFormatter,
         '[e]macs'       => EmacsStyleFormatter,
         '[fi]les'       => FileListFormatter,
         '[fu]ubar'      => FuubarStyleFormatter,