rubocop 0.42.0 → 0.43.0

data/lib/rubocop/cop/lint/eval.rb

@@ -14,7 +14,7 @@ module RuboCop
           return unless receiver.nil? &&
                         method_name == :eval &&
                         !args.empty? &&
-                        args.first.type != :str
+                        !args.first.str_type?
           add_offense(node, :selector)
         end
       end

data/lib/rubocop/cop/lint/format_parameter_mismatch.rb

@@ -73,7 +73,7 @@ module RuboCop
 
           _receiver_node, _method_name, *args = *node
 
-          args.butfirst.any? { |arg| arg.type == :splat }
+          args.butfirst.any?(&:splat_type?)
         end
 
         def heredoc?(node)

data/lib/rubocop/cop/lint/ineffective_access_modifier.rb

@@ -69,14 +69,14 @@ module RuboCop
         end
 
         def check_node(node)
-          if node && node.begin_type?
-            clear
-            check_scope(node)
-
-            @useless.each do |_name, (defs_node, visibility, modifier)|
-              add_offense(defs_node, :keyword,
-                          format_message(visibility, modifier))
-            end
+          return unless node && node.begin_type?
+
+          clear
+          check_scope(node)
+
+          @useless.each do |_name, (defs_node, visibility, modifier)|
+            add_offense(defs_node, :keyword,
+                        format_message(visibility, modifier))
           end
         end
 

data/lib/rubocop/cop/lint/inherit_exception.rb

@@ -4,9 +4,10 @@
 module RuboCop
   module Cop
     module Lint
-      # This cop looks for error classes inheriting from `Exception`.
-      # It is configurable to suggest using either `RuntimeError` (default) or
-      # `StandardError` instead.
+      # This cop looks for error classes inheriting from `Exception`
+      # and its standard library subclasses, excluding subclasses of
+      # `StandardError`. It is configurable to suggest using either
+      # `RuntimeError` (default) or `StandardError` instead.
       #
       # @example
       #
@@ -32,11 +33,24 @@ module RuboCop
       class InheritException < Cop
         include ConfigurableEnforcedStyle
 
-        MSG = 'Inherit from `%s` instead of `Exception`.'.freeze
+        MSG = 'Inherit from `%s` instead of `%s`.'.freeze
         PREFERRED_BASE_CLASS = {
           runtime_error: 'RuntimeError',
           standard_error: 'StandardError'
         }.freeze
+        ILLEGAL_CLASSES = %w(
+          Exception
+          SystemStackError
+          NoMemoryError
+          SecurityError
+          NotImplementedError
+          LoadError
+          SyntaxError
+          ScriptError
+          Interrupt
+          SignalException
+          SystemExit
+        ).freeze
 
         def on_class(node)
           _class, base_class, _body = *node
@@ -49,9 +63,10 @@ module RuboCop
         private
 
         def check(node)
-          if node.const_name == 'Exception'
-            add_offense(node, :expression, format(MSG, preferred_base_class))
-          end
+          return unless ILLEGAL_CLASSES.include?(node.const_name)
+
+          msg = format(MSG, preferred_base_class, node.const_name)
+          add_offense(node, :expression, msg)
         end
 
         def autocorrect(node)

data/lib/rubocop/cop/lint/literal_in_condition.rb

@@ -73,7 +73,7 @@ module RuboCop
         end
 
         def not?(node)
-          return false unless node && node.type == :send
+          return false unless node && node.send_type?
 
           _receiver, method_name, *_args = *node
 
@@ -81,7 +81,7 @@ module RuboCop
         end
 
         def basic_literal?(node)
-          if node && node.type == :array
+          if node && node.array_type?
             primitive_array?(node)
           else
             node.basic_literal?
@@ -104,7 +104,7 @@ module RuboCop
             operands.each do |op|
               handle_node(op)
             end
-          elsif node.type == :begin && node.children.size == 1
+          elsif node.begin_type? && node.children.one?
             child_node = node.children.first
             handle_node(child_node)
           end
@@ -119,8 +119,8 @@ module RuboCop
         end
 
         def check_case_cond(node)
-          return if node.type == :array && !primitive_array?(node)
-          return if node.type == :dstr
+          return if node.array_type? && !primitive_array?(node)
+          return if node.dstr_type?
 
           handle_node(node)
         end

data/lib/rubocop/cop/lint/literal_in_interpolation.rb

@@ -14,7 +14,7 @@ module RuboCop
         COMPOSITE = [:array, :hash, :pair, :irange, :erange].freeze
 
         def on_dstr(node)
-          node.children.select { |n| n.type == :begin }.each do |begin_node|
+          node.each_child_node(:begin) do |begin_node|
             final_node = begin_node.children.last
             next unless final_node
             next if special_keyword?(final_node)
@@ -35,7 +35,7 @@ module RuboCop
 
         def special_keyword?(node)
           # handle strings like __FILE__
-          (node.type == :str && !node.loc.respond_to?(:begin)) ||
+          (node.str_type? && !node.loc.respond_to?(:begin)) ||
             node.source_range.is?('__LINE__')
         end
 
@@ -54,9 +54,7 @@ module RuboCop
           end_pos =
             node.loc.end ? node.loc.end.begin_pos : node.loc.expression.end_pos
 
-          Parser::Source::Range.new(node.source_range.source_buffer,
-                                    node.loc.begin.end_pos,
-                                    end_pos).source
+          range_between(node.loc.begin.end_pos, end_pos).source
         end
 
         # Does node print its own source when converted to a string?

data/lib/rubocop/cop/lint/next_without_accumulator.rb

@@ -38,7 +38,7 @@ module RuboCop
         private
 
         def parent_block_node(node)
-          node.each_ancestor.find { |n| n.type == :block }
+          node.each_ancestor(:block).first
         end
       end
     end

data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb

@@ -15,19 +15,16 @@ module RuboCop
 
         def on_send(node)
           _receiver, method_name, *args = *node
-          return if args.size > 1
+          return unless args.one?
           return if operator?(method_name) || node.asgn_method_call?
-          return unless args.first && args.first.source.start_with?('(')
+
+          first_arg = args.first
+          return unless first_arg.source.start_with?('(')
 
           space_length = spaces_before_left_parenthesis(node)
           return unless space_length > 0
-          expr = args.first.source_range
-          space_range =
-            Parser::Source::Range.new(expr.source_buffer,
-                                      expr.begin_pos - space_length,
-                                      expr.begin_pos)
 
-          add_offense(nil, space_range)
+          add_offense(nil, space_range(first_arg.source_range, space_length))
         end
 
         private
@@ -47,6 +44,10 @@ module RuboCop
           match = without_receiver.match(/^\s*\.?\s*#{method_regexp}(\s+)\(/)
           match ? match.captures[0].length : 0
         end
+
+        def space_range(expr, space_length)
+          range_between(expr.begin_pos - space_length, expr.begin_pos)
+        end
       end
     end
   end

data/lib/rubocop/cop/lint/percent_string_array.rb

@@ -18,13 +18,13 @@ module RuboCop
           'unwanted in the resulting strings.'.freeze
 
         def on_array(node)
-          process(node, *%w(%w %W))
+          process(node, '%w', '%W')
         end
 
         def on_percent_literal(node)
-          if contains_quotes_or_commas?(node)
-            add_offense(node, :expression, MSG)
-          end
+          return unless contains_quotes_or_commas?(node)
+
+          add_offense(node, :expression, MSG)
         end
 
         private
@@ -33,10 +33,10 @@ module RuboCop
           patterns = [/,$/, /^'.*'$/, /^".*"$/]
 
           node.children.any? do |child|
-            literal = child.children.first
+            literal = scrub_string(child.children.first.to_s)
 
             # To avoid likely false positives (e.g. a single ' or ")
-            next if literal.to_s.gsub(/[^\p{Alnum}]/, '').empty?
+            next if literal.gsub(/[^\p{Alnum}]/, '').empty?
 
             patterns.any? { |pat| literal =~ pat }
           end
@@ -54,6 +54,17 @@ module RuboCop
             end
           end
         end
+
+        def scrub_string(string)
+          if string.respond_to?(:scrub)
+            string.scrub
+          else
+            string
+              .encode('UTF-16BE', 'UTF-8',
+                      invalid: :replace, undef: :replace, replace: '?')
+              .encode('UTF-8')
+          end
+        end
       end
     end
   end

data/lib/rubocop/cop/lint/percent_symbol_array.rb

@@ -18,13 +18,13 @@ module RuboCop
           'unwanted in the resulting symbols.'.freeze
 
         def on_array(node)
-          process(node, *%w(%i %I))
+          process(node, '%i', '%I')
         end
 
         def on_percent_literal(node)
-          if contains_colons_or_commas?(node)
-            add_offense(node, :expression, MSG)
-          end
+          return unless contains_colons_or_commas?(node)
+
+          add_offense(node, :expression, MSG)
         end
 
         private

data/lib/rubocop/cop/lint/rand_one.rb

@@ -26,9 +26,9 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          if rand_one?(node)
-            add_offense(node, :expression, format(MSG, node.source))
-          end
+          return unless rand_one?(node)
+
+          add_offense(node, :expression, format(MSG, node.source))
         end
       end
     end

data/lib/rubocop/cop/lint/require_parentheses.rb

@@ -46,9 +46,7 @@ module RuboCop
           return unless offense?(condition)
 
           expr = node.source_range
-          range = Parser::Source::Range.new(expr.source_buffer,
-                                            expr.begin_pos,
-                                            condition.source_range.end_pos)
+          range = range_between(expr.begin_pos, condition.source_range.end_pos)
           add_offense(range, range)
         end
 

data/lib/rubocop/cop/lint/shadowed_exception.rb

@@ -8,24 +8,25 @@ module RuboCop
       # less specific exception being rescued before a more specific
       # exception is rescued.
       #
-      # @example
-      # # bad
-      # begin
-      #   something
-      # rescue Exception
-      #   handle_exception
-      # rescue StandardError
-      #   handle_standard_error
-      # end
+      #   @example
       #
-      # #good
-      # begin
-      #   something
-      # rescue StandardError
-      #   handle_standard_error
-      # rescue Exception
-      #   handle_exception
-      # end
+      #   # bad
+      #   begin
+      #     something
+      #   rescue Exception
+      #     handle_exception
+      #   rescue StandardError
+      #     handle_standard_error
+      #   end
+      #
+      #   # good
+      #   begin
+      #     something
+      #   rescue StandardError
+      #     handle_standard_error
+      #   rescue Exception
+      #     handle_exception
+      #   end
       class ShadowedException < Cop
         MSG = 'Do not shadow rescued Exceptions'.freeze
 
@@ -43,20 +44,25 @@ module RuboCop
           end
 
           return if !rescue_group_rescues_multiple_levels &&
-                    rescued_groups == sort_rescued_groups(rescued_groups)
+                    sorted?(rescued_groups)
 
-          add_offense(node, offense_range(node, rescues))
+          add_offense(node, offense_range(rescues))
         end
 
         private
 
-        def offense_range(node, rescues)
+        def offense_range(rescues)
           first_rescue = rescues.first
           last_rescue = rescues.last
           last_exceptions, = *last_rescue
-          Parser::Source::Range.new(node.loc.expression.source_buffer,
-                                    first_rescue.loc.expression.begin_pos,
-                                    last_exceptions.loc.expression.end_pos)
+          # last_rescue clause may not specify exception class
+          end_pos = if last_exceptions
+                      last_exceptions.loc.expression.end_pos
+                    else
+                      last_rescue.loc.keyword.end_pos
+                    end
+
+          range_between(first_rescue.loc.expression.begin_pos, end_pos)
         end
 
         def rescue_modifier?(node)
@@ -72,20 +78,7 @@ module RuboCop
             return !(group.size == 2 && group.include?(NilClass))
           end
 
-          group.any? do |exception|
-            higher_exception = false
-            group.each_with_index do |_e, i|
-              higher_exception ||= begin
-                                     if group[i].nil? || exception.nil?
-                                       false
-                                     else
-                                       group[i] < exception
-                                     end
-                                   end
-            end
-
-            higher_exception
-          end
+          group.combination(2).any? { |a, b| a && b && a <=> b }
         end
 
         def evaluate_exceptions(rescue_group)
@@ -104,16 +97,18 @@ module RuboCop
           end
         end
 
-        def sort_rescued_groups(groups)
-          groups.sort do |x, y|
+        def sorted?(rescued_groups)
+          rescued_groups.each_cons(2).all? do |x, y|
             if x.include?(Exception)
-              1
+              false
             elsif y.include?(Exception)
-              -1
-            elsif x.empty? || y.empty?
-              0
+              true
+            elsif x.none? || y.none?
+              # consider sorted if a group is empty or only contains
+              # `nil`s
+              true
             else
-              x <=> y || 0
+              (x <=> y || 0) <= 0
             end
           end
         end

data/lib/rubocop/cop/lint/string_conversion_in_interpolation.rb

@@ -16,9 +16,9 @@ module RuboCop
                    'interpolation.'.freeze
 
         def on_dstr(node)
-          node.children.select { |n| n.type == :begin }.each do |begin_node|
+          node.each_child_node(:begin) do |begin_node|
             final_node = begin_node.children.last
-            next unless final_node && final_node.type == :send
+            next unless final_node && final_node.send_type?
 
             receiver, method_name, *args = *final_node
             next unless method_name == :to_s && args.empty?

data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb

@@ -21,12 +21,11 @@ module RuboCop
 
         def check_variable(variable)
           return unless variable.should_be_unused?
-          return if variable.references.empty?
           return if variable.references.none?(&:explicit?)
 
           node = variable.declaration_node
 
-          location = if node.type == :match_with_lvasgn
+          location = if node.match_with_lvasgn_type?
                        node.children.first.source_range
                      else
                        node.loc.name