rubocop 0.76.0 → 0.83.0

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
 
@@ -91,9 +91,10 @@ module RuboCop
 
         def keyword_with_changed_precedence?(node)
           return false unless node.keyword?
-          return true if node.prefix_not?
+          return true if node.respond_to?(:prefix_not?) && node.prefix_not?
 
-          node.arguments? && !node.parenthesized_call?
+          node.respond_to?(:arguments?) && node.arguments? &&
+            !node.parenthesized_call?
         end
       end
     end

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

@@ -28,7 +28,7 @@ module RuboCop
 
         def on_args(node)
           return if super_used?(node)
-          return if whitelist.include?(node.parent.method_name.to_s)
+          return if allowlist.include?(node.parent.method_name.to_s)
 
           option_hash(node) do |options|
             add_offense(options)
@@ -37,8 +37,8 @@ module RuboCop
 
         private
 
-        def whitelist
-          cop_config['Whitelist'] || []
+        def allowlist
+          cop_config['Allowlist'] || []
         end
 
         def suspicious_name?(arg_name)

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

@@ -4,7 +4,7 @@ module RuboCop
   module Cop
     module Style
       # This cop checks for optional arguments to methods
-      # that do not come at the end of the argument list
+      # that do not come at the end of the argument list.
       #
       # @example
       #   # bad

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

@@ -34,7 +34,7 @@ module RuboCop
             (if
               ({lvar ivar cvar gvar} _var)
               ({lvar ivar cvar gvar} _var)
-              _))
+              $_))
         PATTERN
 
         def_node_matcher :unless_assignment?, <<~PATTERN
@@ -51,7 +51,8 @@ module RuboCop
         end
 
         def on_lvasgn(node)
-          return unless ternary_assignment?(node)
+          return unless (else_branch = ternary_assignment?(node))
+          return if else_branch.if_type?
 
           add_offense(node)
         end
@@ -68,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_literal_delimiters.rb

@@ -88,27 +88,27 @@ module RuboCop
         end
 
         def contains_preferred_delimiter?(node, type)
-          preferred_delimiters = preferred_delimiters_for(type)
-          node
-            .children.map { |n| string_source(n) }.compact
-            .any? { |s| preferred_delimiters.any? { |d| s.include?(d) } }
+          contains_delimiter?(node, preferred_delimiters_for(type))
         end
 
         def include_same_character_as_used_for_delimiter?(node, type)
           return false unless %w[%w %i].include?(type)
 
           used_delimiters = matchpairs(begin_source(node)[-1])
-          escaped_delimiters = used_delimiters.map { |d| "\\#{d}" }.join('|')
+          contains_delimiter?(node, used_delimiters)
+        end
 
+        def contains_delimiter?(node, delimiters)
+          delimiters_regexp = Regexp.union(delimiters)
           node
             .children.map { |n| string_source(n) }.compact
-            .any? { |s| Regexp.new(escaped_delimiters) =~ s }
+            .any? { |s| delimiters_regexp =~ s }
         end
 
         def string_source(node)
           if node.is_a?(String)
             node
-          elsif node.respond_to?(:type) && node.str_type?
+          elsif node.respond_to?(:type) && (node.str_type? || node.sym_type?)
             node.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

@@ -46,13 +46,13 @@ module RuboCop
         def autocorrect(node)
           lambda do |corrector|
             if node.ternary?
-              corrector.replace(range_of_offense(node), '||')
+              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
@@ -90,9 +90,13 @@ module RuboCop
         end
 
         def else_source(else_branch)
-          wrap_else =
-            else_branch.basic_conditional? && else_branch.modifier_form?
-          wrap_else ? "(#{else_branch.source})" : else_branch.source
+          if else_branch.basic_conditional? &&
+             else_branch.modifier_form? ||
+             else_branch.range_type?
+            "(#{else_branch.source})"
+          else
+            else_branch.source
+          end
         end
 
         def make_ternary_form(node)
@@ -106,6 +110,14 @@ module RuboCop
             ternary_form
           end
         end
+
+        def correct_ternary(corrector, node)
+          corrector.replace(range_of_offense(node), '||')
+
+          return unless node.else_branch.range_type?
+
+          corrector.wrap(node.else_branch, '(', ')')
+        end
       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_parentheses.rb

@@ -19,7 +19,7 @@ module RuboCop
         def_node_matcher :square_brackets?,
                          '(send {(send _recv _msg) str array hash} :[] ...)'
         def_node_matcher :range_end?, '^^{irange erange}'
-        def_node_matcher :method_node_and_args, '$(send _recv _msg $...)'
+        def_node_matcher :method_node_and_args, '$(call _recv _msg $...)'
         def_node_matcher :rescue?, '{^resbody ^^resbody}'
         def_node_matcher :arg_in_call_with_block?,
                          '^^(block (send _ _ equal?(%0) ...) ...)'
@@ -102,7 +102,7 @@ module RuboCop
           return offense(begin_node, 'a variable') if node.variable?
           return offense(begin_node, 'a constant') if node.const_type?
 
-          check_send(begin_node, node) if node.send_type?
+          check_send(begin_node, node) if node.call_type?
         end
 
         def check_send(begin_node, node)
@@ -195,7 +195,7 @@ module RuboCop
         end
 
         def method_call_with_redundant_parentheses?(node)
-          return false unless node.send_type?
+          return false unless node.call_type?
           return false if node.prefix_not?
           return false if range_end?(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

@@ -54,8 +54,6 @@ module RuboCop
         MULTI_RETURN_MSG = 'To return multiple values, use an array.'
 
         def on_def(node)
-          return unless node.body
-
           check_branch(node.body)
         end
         alias on_defs on_def
@@ -73,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)
@@ -93,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
@@ -152,12 +148,8 @@ module RuboCop
         end
 
         def check_begin_node(node)
-          expressions = *node
-          last_expr = expressions.last
-
-          return unless last_expr&.return_type?
-
-          check_return_node(last_expr)
+          last_expr = node.children.last
+          check_branch(last_expr)
         end
 
         def allow_multiple_return_values?

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/redundant_sort.rb

@@ -63,9 +63,9 @@ module RuboCop
             (send $(send _ $:sort_by _) ${:last :first})
             (send $(send _ $:sort_by _) ${:[] :at :slice} {(int 0) (int -1)})
 
-            (send (block $(send _ ${:sort_by :sort}) ...) ${:last :first})
+            (send ({block numblock} $(send _ ${:sort_by :sort}) ...) ${:last :first})
             (send
-              (block $(send _ ${:sort_by :sort}) ...)
+              ({block numblock} $(send _ ${:sort_by :sort}) ...)
               ${:[] :at :slice} {(int 0) (int -1)}
             )
           }
@@ -127,7 +127,7 @@ module RuboCop
         end
 
         def base(accessor, arg)
-          if accessor == :first || (arg&.zero?)
+          if accessor == :first || arg&.zero?
             'min'
           elsif accessor == :last || arg == -1
             'max'

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/slicing_with_range.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Style
+      # This cop checks that arrays are sliced with endless ranges instead of
+      # `ary[start..-1]` on Ruby 2.6+.
+      #
+      # @example
+      #   # bad
+      #   items[1..-1]
+      #
+      #   # good
+      #   items[1..]
+      class SlicingWithRange < Cop
+        extend TargetRubyVersion
+
+        minimum_target_ruby_version 2.6
+
+        MSG = 'Prefer ary[n..] over ary[n..-1].'
+
+        def_node_matcher :range_till_minus_one?, '(irange (int _) (int -1))'
+
+        def on_send(node)
+          return unless node.method?(:[]) && node.arguments.count == 1
+          return unless range_till_minus_one?(node.arguments.first)
+
+          add_offense(node.arguments.first)
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.remove(node.end)
+          end
+        end
+      end
+    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

@@ -11,8 +11,8 @@ module RuboCop
       #
       # Configuration option: MinSize
       # If set, arrays with fewer elements than this value will not trigger the
-      # cop. For example, a `MinSize of `3` will not enforce a style on an array
-      # of 2 or fewer elements.
+      # cop. For example, a `MinSize` of `3` will not enforce a style on an
+      # array of 2 or fewer elements.
       #
       # @example EnforcedStyle: percent (default)
       #   # good
@@ -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

@@ -162,7 +162,7 @@ module RuboCop
         # `RedundantParentheses` cop is enabled, it will cause an infinite loop
         # as they compete to add and remove the parentheses respectively.
         def infinite_loop?
-          require_parentheses? &&
+          (require_parentheses? || require_parentheses_when_complex?) &&
             redundant_parentheses_enabled?
         end
 
@@ -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

@@ -4,6 +4,14 @@ module RuboCop
   module Cop
     module Style
       # This cop checks for trailing comma in argument lists.
+      # The supported styles are:
+      #
+      # - `consistent_comma`: Requires a comma after the last argument,
+      # 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`: Requires that there is no comma after the last
+      # argument.
       #
       # @example EnforcedStyleForMultiline: consistent_comma
       #   # bad
@@ -20,6 +28,11 @@ module RuboCop
       #
       #   # good
       #   method(
+      #     1, 2, 3,
+      #   )
+      #
+      #   # good
+      #   method(
       #     1,
       #     2,
       #   )
@@ -31,6 +44,28 @@ module RuboCop
       #   # good
       #   method(1, 2)
       #
+      #   # bad
+      #   method(
+      #     1, 2,
+      #     3,
+      #   )
+      #
+      #   # good
+      #   method(
+      #     1, 2,
+      #     3
+      #   )
+      #
+      #   # bad
+      #   method(
+      #     1, 2, 3,
+      #   )
+      #
+      #   # good
+      #   method(
+      #     1, 2, 3
+      #   )
+      #
       #   # good
       #   method(
       #     1,
@@ -68,28 +103,6 @@ module RuboCop
         def self.autocorrect_incompatible_with
           [Layout::HeredocArgumentClosingParenthesis]
         end
-
-        private
-
-        def avoid_autocorrect?(args)
-          args.last.hash_type? && args.last.braces? &&
-            braces_will_be_removed?(args)
-        end
-
-        # Returns true if running with --auto-correct would remove the braces
-        # of the last argument.
-        def braces_will_be_removed?(args)
-          brace_config = config.for_cop('Style/BracesAroundHashParameters')
-          return false unless brace_config.fetch('Enabled')
-          return false if brace_config['AutoCorrect'] == false
-
-          brace_style = brace_config['EnforcedStyle']
-          return true if brace_style == 'no_braces'
-
-          return false unless brace_style == 'context_dependent'
-
-          args.one? || !args[-2].hash_type?
-        end
       end
     end
   end