rubocop 0.43.0 → 0.44.0

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -28,7 +27,7 @@ module RuboCop
       #     handle_exception
       #   end
       class ShadowedException < Cop
-        MSG = 'Do not shadow rescued Exceptions'.freeze
+        MSG = 'Do not shadow rescued Exceptions.'.freeze
 
         def on_rescue(node)
           return if rescue_modifier?(node)

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -47,6 +46,7 @@ module RuboCop
       #   end
       class UnneededSplatExpansion < Cop
         MSG = 'Unnecessary splat expansion.'.freeze
+        ARRAY_PARAM_MSG = 'Pass array contents as separate arguments.'.freeze
         PERCENT_W = '%w'.freeze
         PERCENT_CAPITAL_W = '%W'.freeze
         PERCENT_I = '%i'.freeze
@@ -63,7 +63,12 @@ module RuboCop
             if object.send_type?
               return unless ASSIGNMENT_TYPES.include?(node.parent.parent.type)
             end
-            add_offense(node, :expression)
+
+            if array_splat?(node) && method_argument?(node)
+              add_offense(node, :expression, ARRAY_PARAM_MSG)
+            else
+              add_offense(node, :expression)
+            end
           end
         end
 
@@ -85,6 +90,14 @@ module RuboCop
           end
         end
 
+        def array_splat?(node)
+          node.children.first.array_type?
+        end
+
+        def method_argument?(node)
+          node.parent.send_type?
+        end
+
         def unneeded_brackets?(node)
           parent = node.parent
 

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -8,43 +7,76 @@ module RuboCop
       #
       # @example
       #
-      #   do_something do |used, unused, _unused_but_allowed|
+      #   #good
+      #
+      #   do_something do |used, unused|
+      #     puts used
+      #   end
+      #
+      #   do_something do
+      #     puts :foo
+      #   end
+      #
+      #   define_method(:foo) do |_bar|
+      #     puts :baz
+      #   end
+      #
+      #   # bad
+      #
+      #   do_something do |used, _unused|
       #     puts used
       #   end
+      #
+      #   do_something do |bar|
+      #     puts :foo
+      #   end
+      #
+      #   define_method(:foo) do |bar|
+      #     puts :baz
+      #   end
       class UnusedBlockArgument < Cop
         include UnusedArgument
 
-        def check_argument(variable)
-          return unless variable.block_argument?
-          return if variable.keyword_argument? &&
-                    cop_config && cop_config['AllowUnusedKeywordArguments']
+        private
 
-          if cop_config['IgnoreEmptyBlocks']
-            _send, _args, body = *variable.scope.node
-            return if body.nil?
-          end
+        def check_argument(variable)
+          return if allowed_block?(variable) ||
+                    allowed_keyword_argument?(variable)
 
           super
         end
 
-        def message(variable)
-          message = String.new("Unused #{variable_type(variable)} - " \
-                               "`#{variable.name}`.")
+        def allowed_block?(variable)
+          !variable.block_argument? ||
+            (ignore_empty_blocks? && empty_block?(variable))
+        end
 
-          return message if variable.explicit_block_local_variable?
+        def allowed_keyword_argument?(variable)
+          variable.keyword_argument? &&
+            allow_unused_keyword_arguments?
+        end
 
-          message << ' '
+        def message(variable)
+          message = "Unused #{variable_type(variable)} - `#{variable.name}`."
 
+          if variable.explicit_block_local_variable?
+            message
+          else
+            augment_message(message, variable)
+          end
+        end
+
+        def augment_message(message, variable)
           scope = variable.scope
           all_arguments = scope.variables.each_value.select(&:block_argument?)
 
-          message << if scope.node.lambda?
-                       message_for_lambda(variable, all_arguments)
-                     else
-                       message_for_normal_block(variable, all_arguments)
-                     end
+          augmentation = if scope.node.lambda?
+                           message_for_lambda(variable, all_arguments)
+                         else
+                           message_for_normal_block(variable, all_arguments)
+                         end
 
-          message
+          [message, augmentation].join(' ')
         end
 
         def variable_type(variable)
@@ -56,7 +88,8 @@ module RuboCop
         end
 
         def message_for_normal_block(variable, all_arguments)
-          if all_arguments.none?(&:referenced?)
+          if all_arguments.none?(&:referenced?) &&
+             !define_method_call?(variable)
             if all_arguments.count > 1
               "You can omit all the arguments if you don't care about them."
             else
@@ -68,21 +101,42 @@ module RuboCop
         end
 
         def message_for_lambda(variable, all_arguments)
-          message = String.new(message_for_underscore_prefix(variable))
+          message = message_for_underscore_prefix(variable)
 
           if all_arguments.none?(&:referenced?)
-            message << ' Also consider using a proc without arguments ' \
-                       'instead of a lambda if you want it ' \
-                        "to accept any arguments but don't care about them."
+            proc_message = 'Also consider using a proc without arguments ' \
+                           'instead of a lambda if you want it ' \
+                           "to accept any arguments but don't care about them."
           end
 
-          message
+          [message, proc_message].compact.join(' ')
         end
 
         def message_for_underscore_prefix(variable)
           "If it's necessary, use `_` or `_#{variable.name}` " \
           "as an argument name to indicate that it won't be used."
         end
+
+        def define_method_call?(variable)
+          call, = *variable.scope.node
+          _, method, = *call
+
+          method == :define_method
+        end
+
+        def empty_block?(variable)
+          _send, _args, body = *variable.scope.node
+
+          body.nil?
+        end
+
+        def allow_unused_keyword_arguments?
+          cop_config['AllowUnusedKeywordArguments']
+        end
+
+        def ignore_empty_blocks?
+          cop_config['IgnoreEmptyBlocks']
+        end
       end
     end
   end

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

data/lib/rubocop/cop/metrics/abc_size.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -12,7 +11,7 @@ module RuboCop
 
         MSG = 'Assignment Branch Condition size for %s is too high. ' \
               '[%.4g/%.4g]'.freeze
-        BRANCH_NODES = [:send].freeze
+        BRANCH_NODES = [:send, :csend].freeze
         CONDITION_NODES = CyclomaticComplexity::COUNTED_NODES.freeze
 
         private

data/lib/rubocop/cop/metrics/block_length.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Metrics
+      # This cop checks if the length of a block exceeds some maximum value.
+      # Comment lines can optionally be ignored.
+      # The maximum allowed length is configurable.
+      class BlockLength < Cop
+        include TooManyLines
+
+        LABEL = 'Block'.freeze
+
+        def on_block(node)
+          check_code_length(node)
+        end
+
+        private
+
+        def cop_label
+          LABEL
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/metrics/block_nesting.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

data/lib/rubocop/cop/metrics/class_length.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

data/lib/rubocop/cop/metrics/line_length.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'uri'
@@ -20,17 +19,21 @@ module RuboCop
           end
         end
 
+        private
+
         def check_line(line, index, heredocs)
-          return unless line.length > max
+          return if line.length <= max
+          if ignore_cop_directives? && directive_on_source_line?(index)
+            return check_directive_line(line, index)
+          end
           return if heredocs &&
                     line_in_whitelisted_heredoc?(heredocs, index.succ)
+          return check_uri_line(line, index) if allow_uri?
 
-          if allow_uri?
-            uri_range = find_excessive_uri_range(line)
-            return if uri_range && allowed_uri_position?(line, uri_range)
-          end
-
-          offense(excess_range(uri_range, line, index), line)
+          offense(
+            source_range(processed_source.buffer, index + 1, 0...line.length),
+            line
+          )
         end
 
         def offense(loc, line)
@@ -82,6 +85,10 @@ module RuboCop
           cop_config['AllowURI']
         end
 
+        def ignore_cop_directives?
+          cop_config['IgnoreCopDirectives']
+        end
+
         def allowed_uri_position?(line, uri_range)
           uri_range.begin < max && uri_range.end == line.length
         end
@@ -112,6 +119,36 @@ module RuboCop
         def uri_regexp
           @regexp ||= URI.regexp(cop_config['URISchemes'])
         end
+
+        def check_directive_line(line, index)
+          return if line_length_without_directive(line) <= max
+
+          range = max..(line_length_without_directive(line) - 1)
+          offense(source_range(processed_source.buffer, index + 1, range), line)
+        end
+
+        def directive_on_source_line?(index)
+          source_line_number = index + processed_source.buffer.first_line
+          comment =
+            processed_source
+            .comments
+            .detect { |e| e.location.line == source_line_number }
+
+          return false unless comment
+          comment.text.match(CommentConfig::COMMENT_DIRECTIVE_REGEXP)
+        end
+
+        def line_length_without_directive(line)
+          before_comment, = line.split('#')
+          before_comment.rstrip.length
+        end
+
+        def check_uri_line(line, index)
+          uri_range = find_excessive_uri_range(line)
+          return if uri_range && allowed_uri_position?(line, uri_range)
+
+          offense(excess_range(uri_range, line, index), line)
+        end
       end
     end
   end