rubocop 0.50.0 → 0.51.0

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

@@ -24,7 +24,7 @@ module RuboCop
           quote_styles = detect_quote_styles(node)
 
           if quote_styles.size > 1
-            add_offense(node, :expression, MSG_INCONSISTENT)
+            add_offense(node, message: MSG_INCONSISTENT)
           else
             check_multiline_quote_style(node, quote_styles[0])
           end
@@ -76,10 +76,11 @@ module RuboCop
           range = node.source_range
           children = node.children
           if unexpected_single_quotes?(quote)
-            add_offense(node, range) if children.all? { |c| wrong_quotes?(c) }
+            all_children_with_quotes = children.all? { |c| wrong_quotes?(c) }
+            add_offense(node, location: range) if all_children_with_quotes
           elsif unexpected_double_quotes?(quote) &&
                 !accept_child_double_quotes?(children)
-            add_offense(node, range)
+            add_offense(node, location: range)
           end
         end
 

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

@@ -13,7 +13,7 @@ module RuboCop
         def on_send(node)
           return unless preferred_method(node.method_name)
 
-          add_offense(node, :selector)
+          add_offense(node, location: :selector)
         end
 
         private

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

@@ -19,12 +19,12 @@ module RuboCop
           _name, superclass, _body = *node
           return unless struct_constructor?(superclass)
 
-          add_offense(node, superclass.source_range)
+          add_offense(node, location: superclass.source_range)
         end
 
         def_node_matcher :struct_constructor?, <<-PATTERN
-           {(send (const nil :Struct) :new ...)
-            (block (send (const nil :Struct) :new ...) ...)}
+           {(send (const nil? :Struct) :new ...)
+            (block (send (const nil? :Struct) :new ...) ...)}
         PATTERN
       end
     end

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

@@ -7,8 +7,7 @@ module RuboCop
       # using the %i() syntax.
       #
       # Alternatively, it checks for symbol arrays using the %i() syntax on
-      # projects which do not want to use that syntax, perhaps because they
-      # support a version of Ruby lower than 2.0.
+      # projects which do not want to use that syntax.
       #
       # Configuration option: MinSize
       # If set, arrays with fewer elements than this value will not trigger the
@@ -38,9 +37,6 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include PercentLiteral
         include PercentArray
-        extend TargetRubyVersion
-
-        minimum_target_ruby_version 2.0
 
         PERCENT_MSG = 'Use `%i` or `%I` for an array of symbols.'.freeze
         ARRAY_MSG = 'Use `[]` for an array of symbols.'.freeze

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

@@ -15,7 +15,7 @@ module RuboCop
         MSG = 'Pass `&:%s` as an argument to `%s` instead of a block.'.freeze
         SUPER_TYPES = %i[super zsuper].freeze
 
-        def_node_matcher :proc_node?, '(send (const nil :Proc) :new)'
+        def_node_matcher :proc_node?, '(send (const nil? :Proc) :new)'
         def_node_matcher :symbol_proc?, <<-PATTERN
           (block
             ${(send ...) (super ...) zsuper}
@@ -71,10 +71,10 @@ module RuboCop
           range = range_between(block_start, block_end)
 
           add_offense(node,
-                      range,
-                      format(MSG,
-                             method_name,
-                             block_method_name))
+                      location: range,
+                      message: format(MSG,
+                                      method_name,
+                                      block_method_name))
         end
 
         def autocorrect_method(corrector, node, args, method_name)

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

@@ -64,7 +64,7 @@ module RuboCop
         def on_if(node)
           return unless node.ternary? && !infinite_loop? && offense?(node)
 
-          add_offense(node, node.source_range)
+          add_offense(node, location: node.source_range)
         end
 
         private
@@ -169,7 +169,7 @@ module RuboCop
 
         def_node_matcher :method_call_argument, <<-PATTERN
           {(:defined? $...)
-           (send {_ nil} _ $(send nil _)...)}
+           (send {_ nil?} _ $(send nil? _)...)}
         PATTERN
 
         def correct_parenthesized(condition)

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

@@ -28,22 +28,22 @@ module RuboCop
         UNDERSCORE = '_'.freeze
 
         def on_masgn(node)
-          range = unneeded_range(node)
+          ranges = unneeded_ranges(node)
 
-          return unless range
+          ranges.each do |range|
+            good_code = node.source
+            offset = range.begin_pos - node.source_range.begin_pos
+            good_code[offset, range.size] = ''
 
-          good_code = node.source
-          offset = range.begin_pos - node.source_range.begin_pos
-          good_code[offset, range.size] = ''
-
-          add_offense(node, range, format(MSG, good_code))
+            add_offense(node, location: range, message: format(MSG, good_code))
+          end
         end
 
         def autocorrect(node)
-          range = unneeded_range(node)
+          ranges = unneeded_ranges(node)
 
           lambda do |corrector|
-            corrector.remove(range) if range
+            ranges.each { |range| corrector.remove(range) if range }
           end
         end
 
@@ -60,6 +60,7 @@ module RuboCop
 
         def find_first_possible_offense(variables)
           variables.reduce(nil) do |offense, variable|
+            break offense unless %i[lvasgn splat].include?(variable.type)
             var, = *variable
             var, = *var
             if allow_named_underscore_variables
@@ -89,35 +90,57 @@ module RuboCop
             cop_config['AllowNamedUnderscoreVariables']
         end
 
-        def unneeded_range(node)
-          left, right = *node
-          variables = *left
+        def unneeded_ranges(node)
+          node.masgn_type? ? (mlhs_node, = *node) : mlhs_node = node
+          variables = *mlhs_node
+
+          main_offense = main_node_offense(node)
+          if main_offense.nil?
+            children_offenses(variables)
+          else
+            children_offenses(variables) << main_offense
+          end
+        end
+
+        def main_node_offense(node)
+          node.masgn_type? ? (mlhs_node, right = *node) : mlhs_node = node
+
+          variables = *mlhs_node
           first_offense = find_first_offense(variables)
 
           return unless first_offense
 
           if unused_variables_only?(first_offense, variables)
-            return left_side_range(left, right)
+            return unused_range(node.type, mlhs_node, right)
           end
 
-          if Util.parentheses?(left)
-            return range_for_parentheses(first_offense, left)
+          if Util.parentheses?(mlhs_node)
+            return range_for_parentheses(first_offense, mlhs_node)
           end
 
-          range_between(
-            first_offense.source_range.begin_pos,
-            node.loc.operator.begin_pos
-          )
+          range_between(first_offense.source_range.begin_pos,
+                        node.loc.operator.begin_pos)
+        end
+
+        def children_offenses(variables)
+          variables.select(&:mlhs_type?).flat_map { |v| unneeded_ranges(v) }
         end
 
         def unused_variables_only?(offense, variables)
           offense.source_range == variables.first.source_range
         end
 
-        def left_side_range(left, right)
-          range_between(
-            left.source_range.begin_pos, right.source_range.begin_pos
-          )
+        def unused_range(node_type, mlhs_node, right)
+          start_range = mlhs_node.source_range.begin_pos
+
+          end_range = case node_type
+                      when :masgn
+                        right.source_range.begin_pos
+                      when :mlhs
+                        mlhs_node.source_range.end_pos
+                      end
+
+          range_between(start_range, end_range)
         end
 
         def range_for_parentheses(offense, left)

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

@@ -40,7 +40,9 @@ module RuboCop
                  end
           return unless kind
 
-          add_offense(node, :keyword, format(MSG, kind, kind))
+          add_offense(node,
+                      location: :keyword,
+                      message: format(MSG, kind, kind))
         end
 
         def exact_name_match?

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

@@ -5,11 +5,9 @@ module RuboCop
     module Style
       # This cop checks for variable interpolation (like "#@ivar").
       class VariableInterpolation < Cop
-        # rubocop:disable Lint/InterpolationCheck
         MSG = 'Replace interpolated variable `%s` ' \
               'with expression `#{%s}`.'.freeze
 
-        # rubocop:enable Lint/InterpolationCheck
         def on_dstr(node)
           check_for_interpolation(node)
         end

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

@@ -10,7 +10,7 @@ module RuboCop
         def on_when(node)
           return if node.multiline? || node.then? || !node.body
 
-          add_offense(node, :begin)
+          add_offense(node, location: :begin)
         end
 
         def autocorrect(node)

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

@@ -18,7 +18,8 @@ module RuboCop
         def handle(node)
           return unless node.multiline? && node.do?
 
-          add_offense(node, :begin, format(MSG, node.keyword))
+          add_offense(node, location: :begin,
+                            message: format(MSG, node.keyword))
         end
 
         private

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

@@ -33,7 +33,8 @@ module RuboCop
         def check(node)
           return unless node.multiline? && single_line_as_modifier?(node)
 
-          add_offense(node, :keyword, format(MSG, node.keyword))
+          add_offense(node, location: :keyword,
+                            message: format(MSG, node.keyword))
         end
       end
     end

data/lib/rubocop/cop/style/word_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)

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

@@ -42,8 +42,8 @@ module RuboCop
 
           return unless zero_length_predicate
 
-          add_offense(node, :expression,
-                      format(ZERO_MSG, *zero_length_predicate))
+          add_offense(node,
+                      message: format(ZERO_MSG, *zero_length_predicate))
         end
 
         def check_nonzero_length_predicate(node)
@@ -51,8 +51,8 @@ module RuboCop
 
           return unless nonzero_length_predicate
 
-          add_offense(node, :expression,
-                      format(NONZERO_MSG, *nonzero_length_predicate))
+          add_offense(node,
+                      message: format(NONZERO_MSG, *nonzero_length_predicate))
         end
 
         def_node_matcher :zero_length_predicate, <<-PATTERN

data/lib/rubocop/cop/util.rb

@@ -295,7 +295,7 @@ module RuboCop
       end
 
       def compatible_external_encoding_for?(src)
-        src = src.dup if RUBY_VERSION < '2.3'
+        src = src.dup if RUBY_VERSION < '2.3' || RUBY_ENGINE == 'jruby'
         src.force_encoding(Encoding.default_external).valid_encoding?
       end
 
@@ -304,17 +304,6 @@ module RuboCop
           .sub(/^Enforced/, 'Supported')
           .sub('Style', 'Styles')
       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/formatter/html_formatter.rb

@@ -4,7 +4,7 @@ require 'cgi'
 require 'erb'
 require 'ostruct'
 require 'base64'
-require 'rubocop/formatter/text_util'
+require_relative 'text_util'
 
 module RuboCop
   module Formatter

data/lib/rubocop/formatter/simple_text_formatter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'rubocop/formatter/colorizable'
-require 'rubocop/formatter/text_util'
+require_relative 'colorizable'
+require_relative 'text_util'
 
 module RuboCop
   module Formatter

data/lib/rubocop/node_pattern.rb

@@ -116,7 +116,7 @@ module RuboCop
       PREDICATE = /\A#{IDENTIFIER}+\?\(?\Z/
       WILDCARD  = /\A_#{IDENTIFIER}*\Z/
       FUNCALL   = /\A\##{METHOD_NAME}/
-      LITERAL   = /\A(?:#{SYMBOL}|#{NUMBER}|#{STRING}|nil)\Z/
+      LITERAL   = /\A(?:#{SYMBOL}|#{NUMBER}|#{STRING})\Z/
       PARAM     = /\A#{PARAM_NUMBER}\Z/
       CLOSING   = /\A(?:\)|\}|\])\Z/
 

data/lib/rubocop/options.rb

@@ -100,6 +100,7 @@ module RuboCop
       end
 
       option(opts, '--force-exclusion')
+      option(opts, '--ignore-parent-exclusion')
 
       option(opts, '--force-default-config')
 
@@ -303,6 +304,9 @@ module RuboCop
       force_exclusion:      ['Force excluding files specified in the',
                              'configuration `Exclude` even if they are',
                              'explicitly passed as arguments.'],
+      ignore_parent_exclusion:
+                            ['Prevent from inheriting AllCops/Exclude from',
+                             'parent folders.'],
       force_default_config: ['Use default configuration even if configuration',
                              'files are present in the directory tree.'],
       format:               ['Choose an output formatter. This option',

data/lib/rubocop/processed_source.rb

@@ -107,15 +107,9 @@ module RuboCop
       [ast, comments, tokens]
     end
 
-    # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/MethodLength
     def parser_class(ruby_version)
       case ruby_version
-      when 1.9
-        require 'parser/ruby19'
-        Parser::Ruby19
-      when 2.0
-        require 'parser/ruby20'
-        Parser::Ruby20
       when 2.1
         require 'parser/ruby21'
         Parser::Ruby21
@@ -132,7 +126,7 @@ module RuboCop
         raise ArgumentError, "Unknown Ruby version: #{ruby_version.inspect}"
       end
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/MethodLength
 
     def create_parser(ruby_version)
       builder = RuboCop::AST::Builder.new

data/lib/rubocop/rake_task.rb

@@ -17,25 +17,21 @@ module RuboCop
     attr_accessor :requires
     attr_accessor :options
 
-    def initialize(*args, &task_block)
-      setup_ivars(args)
+    def initialize(name = :rubocop, *args, &task_block)
+      setup_ivars(name)
 
       desc 'Run RuboCop' unless ::Rake.application.last_description
 
       task(name, *args) do |_, task_args|
-        RakeFileUtils.send(:verbose, verbose) do
+        RakeFileUtils.verbose(verbose) do
           yield(*[self, task_args].slice(0, task_block.arity)) if block_given?
-          run_main_task(verbose)
+          run_cli(verbose, full_options)
         end
       end
 
       setup_subtasks(name, *args, &task_block)
     end
 
-    def run_main_task(verbose)
-      run_cli(verbose, full_options)
-    end
-
     private
 
     def run_cli(verbose, options)
@@ -50,19 +46,14 @@ module RuboCop
     end
 
     def full_options
-      [].tap do |result|
-        result.concat(formatters.map { |f| ['--format', f] }.flatten)
-        result.concat(requires.map { |r| ['--require', r] }.flatten)
-        result.concat(options.flatten)
-        result.concat(patterns)
-      end
+      formatters.map { |f| ['--format', f] }.flatten
+                .concat(requires.map { |r| ['--require', r] }.flatten)
+                .concat(options.flatten)
+                .concat(patterns)
     end
 
-    def setup_ivars(args)
-      # More lazy-loading to keep load time down.
-      require 'rubocop/options'
-
-      @name = args.shift || :rubocop
+    def setup_ivars(name)
+      @name = name
       @verbose = true
       @fail_on_error = true
       @patterns = []
@@ -72,13 +63,15 @@ module RuboCop
     end
 
     def setup_subtasks(name, *args, &task_block)
-      namespace name do
+      namespace(name) do
         desc 'Auto-correct RuboCop offenses'
 
         task(:auto_correct, *args) do |_, task_args|
-          yield(*[self, task_args].slice(0, task_block.arity)) if block_given?
-          options = full_options.unshift('--auto-correct')
-          run_cli(verbose, options)
+          RakeFileUtils.verbose(verbose) do
+            yield(*[self, task_args].slice(0, task_block.arity)) if block_given?
+            options = full_options.unshift('--auto-correct')
+            run_cli(verbose, options)
+          end
         end
       end
     end