rubocop 0.43.0 → 0.44.0

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -36,7 +35,8 @@ module RuboCop
           if not_equal_to_nil?(method, args)
             add_offense(node, :selector)
           elsif include_semantic_changes? &&
-                not_and_nil_check?(method, receiver)
+                (not_and_nil_check?(method, receiver) ||
+                 unless_and_nil_check?(node, method))
             add_offense(node, :expression)
           end
         end
@@ -51,6 +51,13 @@ module RuboCop
           method == :! && nil_check?(receiver)
         end
 
+        def unless_and_nil_check?(send_node, method)
+          return unless method == :nil?
+
+          parent = send_node.parent
+          parent && parent.if_type? && parent.loc.keyword.is?('unless')
+        end
+
         def message(node)
           _receiver, method, _args = *node
           if method == :!=
@@ -89,6 +96,8 @@ module RuboCop
             autocorrect_comparison(node)
           elsif method == :!
             autocorrect_non_nil(node, receiver)
+          elsif method == :nil?
+            autocorrect_unless_nil(node, receiver)
           end
         end
 
@@ -119,6 +128,13 @@ module RuboCop
             end
           end
         end
+
+        def autocorrect_unless_nil(node, receiver)
+          lambda do |corrector|
+            corrector.replace(node.parent.loc.keyword, 'if')
+            corrector.replace(node.source_range, receiver.source)
+          end
+        end
       end
     end
   end

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

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

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -51,13 +50,11 @@ module RuboCop
         end
 
         def octal_literal_type(literal)
-          # rubocop:disable Style/GuardClause
           if literal =~ OCTAL_ZERO_ONLY_REGEX && octal_zero_only?
-            return :octal_zero_only
+            :octal_zero_only
           elsif literal =~ OCTAL_REGEX && !octal_zero_only?
-            return :octal
+            :octal
           end
-          # rubocop:enable Style/GuardClause
         end
 
         def hex_bin_dec_literal_type(literal)

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'tsort'
@@ -43,7 +42,8 @@ module RuboCop
 
         def allowed_masign?(lhs_elements, rhs_elements)
           lhs_elements.size != rhs_elements.size ||
-            !find_valid_order(lhs_elements, rhs_elements)
+            !find_valid_order(lhs_elements,
+                              add_self_to_getters(rhs_elements))
         end
 
         def allowed_lhs?(node)
@@ -105,6 +105,17 @@ module RuboCop
           end
         end
 
+        # Converts (send nil :something) nodes to (send (:self) :something).
+        # This makes the sorting algorithm work for expressions such as
+        # `self.a, self.b = b, a`.
+        def add_self_to_getters(right_elements)
+          right_elements.map do |e|
+            implicit_self_getter?(e) { |var| s(:send, s(:self), var) } || e
+          end
+        end
+
+        def_node_matcher :implicit_self_getter?, '(send nil $_)'
+
         # Helper class necessitated by silly design of TSort prior to Ruby 2.1
         # Newer versions have a better API, but that doesn't help us
         class AssignmentSorter

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

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

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

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

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

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

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

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

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

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

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

@@ -1,20 +1,50 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
   module Cop
     module Style
-      # This cop checks for uses of methods Hash#has_key? and Hash#has_value?
-      # Prefer to use Hash#key? and Hash#value? instead
+      # This cop (by default) checks for uses of methods Hash#has_key? and
+      # Hash#has_value? where it enforces Hash#key? and Hash#value?
+      # It is configurable to enforce the inverse, using `verbose` method
+      # names also.
+      #
+      # @example
+      #
+      #  # EnforcedStyle: short (default)
+      #
+      #  # bad
+      #  Hash#has_key?
+      #  Hash#has_value?
+      #
+      #  # good
+      #  Hash#key?
+      #  Hash#value?
+      #
+      # @example
+      #
+      #  # EnforcedStyle: verbose
+      #
+      #  # bad
+      #  Hash#key?
+      #  Hash#value?
+      #
+      #  # good
+      #  Hash#has_key?
+      #  Hash#has_value?
       class PreferredHashMethods < Cop
+        include ConfigurableEnforcedStyle
+
         MSG = 'Use `Hash#%s` instead of `Hash#%s`.'.freeze
 
-        PREFERRED_METHODS = [:has_key?, :has_value?].freeze
+        OFFENDING_SELECTORS = {
+          short: [:has_key?, :has_value?],
+          verbose: [:key?, :value?]
+        }.freeze
 
         def on_send(node)
           _receiver, method_name, *args = *node
           return unless args.size == 1 &&
-                        PREFERRED_METHODS.include?(method_name)
+                        offending_selector?(method_name)
 
           add_offense(node, :selector,
                       format(MSG,
@@ -32,7 +62,15 @@ module RuboCop
         private
 
         def proper_method_name(method_name)
-          method_name.to_s.sub(/has_/, '')
+          if style == :verbose
+            "has_#{method_name}"
+          else
+            method_name.to_s.sub(/has_/, '')
+          end
+        end
+
+        def offending_selector?(method_name)
+          OFFENDING_SELECTORS[style].include?(method_name)
         end
       end
     end

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

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

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -106,21 +105,21 @@ module RuboCop
         def check_exploded(node)
           _receiver, selector, *args = *node
 
-          if args.one?
-            arg, = *args
+          return correct_style_detected unless args.one?
+          arg, = *args
 
-            if arg.send_type? && arg.loc.selector.is?('new')
-              _receiver, _selector, *constructor_args = *arg
+          return unless arg.send_type? && arg.loc.selector.is?('new')
+          _receiver, _selector, *constructor_args = *arg
 
-              # Allow code like `raise Ex.new(arg1, arg2)`.
-              if constructor_args.size <= 1
-                add_offense(node, :expression, message(selector)) do
-                  opposite_style_detected
-                end
-              end
-            end
-          else
-            correct_style_detected
+          # Allow code like `raise Ex.new(arg1, arg2)`.
+          return unless constructor_args.size <= 1
+
+          # Allow code like `raise Ex.new(*args)`
+          first_arg = constructor_args.first
+          return if first_arg && first_arg.splat_type?
+
+          add_offense(node, :expression, message(selector)) do
+            opposite_style_detected
           end
         end
 

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -19,7 +18,8 @@ module RuboCop
 
         ALLOWED_LITERALS = [:irange, :erange].freeze
 
-        def_node_matcher :square_brackets?, '(send (send _recv _msg) :[] ...)'
+        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 :rescue?, '{^resbody ^^resbody}'

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -23,6 +22,7 @@ module RuboCop
       # or a case expression with a default branch.
       class RedundantReturn < Cop
         include OnMethodDef
+        include IfNode
 
         MSG = 'Redundant `return` detected.'.freeze
 
@@ -72,15 +72,15 @@ module RuboCop
         def on_method_def(_node, _method_name, _args, body)
           return unless body
 
-          if body.return_type?
-            check_return_node(body)
-          elsif body.begin_type?
-            expressions = *body
-            last_expr = expressions.last
-
-            return unless last_expr && last_expr.return_type?
+          check_branch(body)
+        end
 
-            check_return_node(last_expr)
+        def check_branch(node)
+          case node.type
+          when :return then check_return_node(node)
+          when :case then check_case_node(node)
+          when :if then check_if_node(node)
+          when :begin then check_begin_node(node)
           end
         end
 
@@ -90,6 +90,34 @@ module RuboCop
 
           add_offense(node, :keyword)
         end
+
+        def check_case_node(node)
+          _cond, *when_nodes, else_node = *node
+          when_nodes.each { |when_node| check_when_node(when_node) }
+          check_branch(else_node) if else_node
+        end
+
+        def check_when_node(node)
+          _cond, body = *node
+          check_branch(body)
+        end
+
+        def check_if_node(node)
+          return if modifier_if?(node) || ternary?(node)
+
+          _cond, if_node, else_node = if_node_parts(node)
+          check_branch(if_node)
+          check_branch(else_node) if else_node
+        end
+
+        def check_begin_node(node)
+          expressions = *node
+          last_expr = expressions.last
+
+          return unless last_expr && last_expr.return_type?
+
+          check_return_node(last_expr)
+        end
       end
     end
   end