rubocop 0.42.0 → 0.52.1

data/lib/rubocop/cop/style/{method_call_parentheses.rb → method_call_without_args_parentheses.rb}

@@ -1,27 +1,28 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
   module Cop
     module Style
       # This cop checks for unwanted parentheses in parameterless method calls.
-      class MethodCallParentheses < Cop
+      #
+      # @example
+      #   # bad
+      #   object.some_method()
+      #
+      #   # good
+      #   object.some_method
+      class MethodCallWithoutArgsParentheses < Cop
         MSG = 'Do not use parentheses for method calls with ' \
               'no arguments.'.freeze
 
-        ASGN_NODES = [:lvasgn, :masgn] + SHORTHAND_ASGN_NODES
+        ASGN_NODES = %i[lvasgn masgn] + SHORTHAND_ASGN_NODES
 
         def on_send(node)
-          _receiver, method_name, *args = *node
-
-          # methods starting with a capital letter should be skipped
-          return if method_name =~ /\A[A-Z]/
-          return unless args.empty? && node.loc.begin
+          return if ineligible_node?(node)
+          return unless !node.arguments? && node.parenthesized?
           return if same_name_assignment?(node)
-          return if lambda_call_syntax?(node)
-          return if node.keyword_not?
 
-          add_offense(node, :begin)
+          add_offense(node, location: :begin)
         end
 
         def autocorrect(node)
@@ -33,9 +34,21 @@ module RuboCop
 
         private
 
+        def ineligible_node?(node)
+          node.camel_case_method? || node.implicit_call? || node.keyword_not?
+        end
+
         def same_name_assignment?(node)
-          _receiver, method_name, *_args = *node
+          any_assignment?(node) do |asgn_node|
+            if asgn_node.masgn_type?
+              next variable_in_mass_assignment?(node.method_name, asgn_node)
+            end
 
+            asgn_node.loc.name.source == node.method_name.to_s
+          end
+        end
+
+        def any_assignment?(node)
           node.each_ancestor(*ASGN_NODES).any? do |asgn_node|
             # `obj.method = value` parses as (send ... :method= ...), and will
             # not be returned as an `asgn_node` here, however,
@@ -45,24 +58,18 @@ module RuboCop
             if asgn_node.or_asgn_type? || asgn_node.and_asgn_type? ||
                asgn_node.op_asgn_type?
               asgn_node, _value = *asgn_node
-              return false if asgn_node.send_type?
-            end
-
-            if asgn_node.masgn_type?
-              mlhs_node, _mrhs_node = *asgn_node
-              var_nodes = *mlhs_node
-              vars = var_nodes.map { |n| (_b = *n).first }
-
-              return vars.include?(method_name)
+              next if asgn_node.send_type?
             end
 
-            asgn_node.loc.name.source == method_name.to_s
+            yield asgn_node
           end
         end
 
-        # don't check `lambda.()` syntax; the Style/LambdaCall cop does that
-        def lambda_call_syntax?(node)
-          node.method_name == :call && node.loc.selector.nil?
+        def variable_in_mass_assignment?(variable_name, node)
+          mlhs_node, _mrhs_node = *node
+          var_nodes = *mlhs_node
+
+          var_nodes.map { |n| n.to_a.first }.include?(variable_name)
         end
       end
     end

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -17,25 +16,26 @@ module RuboCop
         MSG = 'Avoid chaining a method call on a do...end block.'.freeze
 
         def on_block(node)
-          method, _args, _body = *node
           # If the method that is chained on the do...end block is itself a
           # method with a block, we allow it. It's pretty safe to assume that
           # these calls are not missed by anyone reading code. We also want to
           # avoid double reporting of offenses checked by the
           # MultilineBlockChain cop.
-          ignore_node(method)
+          ignore_node(node.send_node)
         end
 
         def on_send(node)
           return if ignored_node?(node)
-          receiver, _method_name, *_args = *node
-          return unless receiver && receiver.type == :block &&
+
+          receiver = node.receiver
+
+          return unless receiver && receiver.block_type? &&
                         receiver.loc.end.is?('end')
 
-          range = Parser::Source::Range.new(receiver.loc.end.source_buffer,
-                                            receiver.loc.end.begin_pos,
-                                            node.source_range.end_pos)
-          add_offense(nil, range)
+          range = range_between(receiver.loc.end.begin_pos,
+                                node.source_range.end_pos)
+
+          add_offense(nil, location: range)
         end
       end
     end

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -6,14 +5,98 @@ module RuboCop
     module Style
       # This cops checks for parentheses around the arguments in method
       # definitions. Both instance and class/singleton methods are checked.
+      #
+      # @example EnforcedStyle: require_parentheses (default)
+      #   # The `require_parentheses` style requires method definitions
+      #   # to always use parentheses
+      #
+      #   # bad
+      #   def bar num1, num2
+      #     num1 + num2
+      #   end
+      #
+      #   def foo descriptive_var_name,
+      #           another_descriptive_var_name,
+      #           last_descriptive_var_name
+      #     do_something
+      #   end
+      #
+      #   # good
+      #   def bar(num1, num2)
+      #     num1 + num2
+      #   end
+      #
+      #   def foo(descriptive_var_name,
+      #           another_descriptive_var_name,
+      #           last_descriptive_var_name)
+      #     do_something
+      #   end
+      #
+      # @example EnforcedStyle: require_no_parentheses
+      #   # The `require_no_parentheses` style requires method definitions
+      #   # to never use parentheses
+      #
+      #   # bad
+      #   def bar(num1, num2)
+      #     num1 + num2
+      #   end
+      #
+      #   def foo(descriptive_var_name,
+      #           another_descriptive_var_name,
+      #           last_descriptive_var_name)
+      #     do_something
+      #   end
+      #
+      #   # good
+      #   def bar num1, num2
+      #     num1 + num2
+      #   end
+      #
+      #   def foo descriptive_var_name,
+      #           another_descriptive_var_name,
+      #           last_descriptive_var_name
+      #     do_something
+      #   end
+      #
+      # @example EnforcedStyle: require_no_parentheses_except_multiline
+      #   # The `require_no_parentheses_except_multiline` style prefers no
+      #   # parantheses when method definition arguments fit on single line,
+      #   # but prefers parantheses when arguments span multiple lines.
+      #
+      #   # bad
+      #   def bar(num1, num2)
+      #     num1 + num2
+      #   end
+      #
+      #   def foo descriptive_var_name,
+      #           another_descriptive_var_name,
+      #           last_descriptive_var_name
+      #     do_something
+      #   end
+      #
+      #   # good
+      #   def bar num1, num2
+      #     num1 + num2
+      #   end
+      #
+      #   def foo(descriptive_var_name,
+      #           another_descriptive_var_name,
+      #           last_descriptive_var_name)
+      #     do_something
+      #   end
       class MethodDefParentheses < Cop
-        include OnMethodDef
         include ConfigurableEnforcedStyle
 
-        def on_method_def(node, _method_name, args, _body)
+        MSG_PRESENT = 'Use def without parentheses.'.freeze
+        MSG_MISSING = 'Use def with parentheses when there are ' \
+                      'parameters.'.freeze
+
+        def on_def(node)
+          args = node.arguments
+
           if require_parentheses?(args)
-            if arguments_without_parentheses?(args)
-              missing_parentheses(node, args)
+            if arguments_without_parentheses?(node)
+              missing_parentheses(node)
             else
               correct_style_detected
             end
@@ -23,6 +106,7 @@ module RuboCop
             correct_style_detected
           end
         end
+        alias on_defs on_def
 
         def autocorrect(node)
           lambda do |corrector|
@@ -31,11 +115,11 @@ module RuboCop
               corrector.replace(node.loc.begin, ' ')
               corrector.remove(node.loc.end)
             else
-              args_expr = args_node(node).source_range
-              args_with_space = range_with_surrounding_space(args_expr, :left)
-              just_space = Parser::Source::Range.new(args_expr.source_buffer,
-                                                     args_with_space.begin_pos,
-                                                     args_expr.begin_pos)
+              args_expr = node.arguments.source_range
+              args_with_space = range_with_surrounding_space(range: args_expr,
+                                                             side: :left)
+              just_space = range_between(args_with_space.begin_pos,
+                                         args_expr.begin_pos)
               corrector.replace(just_space, '(')
               corrector.insert_after(args_expr, ')')
             end
@@ -50,35 +134,23 @@ module RuboCop
              args.multiline?)
         end
 
-        def arguments_without_parentheses?(args)
-          arguments?(args) && !parentheses?(args)
+        def arguments_without_parentheses?(node)
+          node.arguments? && !parentheses?(node.arguments)
         end
 
-        def missing_parentheses(node, args)
-          add_offense(node, args.source_range,
-                      'Use def with parentheses when there are parameters.') do
+        def missing_parentheses(node)
+          location = node.arguments.source_range
+
+          add_offense(node, location: location, message: MSG_MISSING) do
             unexpected_style_detected(:require_no_parentheses)
           end
         end
 
         def unwanted_parentheses(args)
-          add_offense(args, :expression, 'Use def without parentheses.') do
+          add_offense(args, message: MSG_PRESENT) do
             unexpected_style_detected(:require_parentheses)
           end
         end
-
-        def args_node(def_node)
-          if def_node.type == :def
-            _method_name, args, _body = *def_node
-          else
-            _scope, _method_name, args, _body = *def_node
-          end
-          args
-        end
-
-        def arguments?(args)
-          !args.children.empty?
-        end
       end
     end
   end

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -9,36 +8,35 @@ module RuboCop
       #
       # @example
       #   #bad
-      #   def method_missing(...)
-      #     ...
+      #   def method_missing(name, *args)
+      #     # ...
       #   end
       #
       #   #good
-      #   def respond_to_missing?(...)
-      #     ...
+      #   def respond_to_missing?(name, include_private)
+      #     # ...
       #   end
       #
-      #   def method_missing(...)
-      #     ...
+      #   def method_missing(name, *args)
+      #     # ...
       #     super
       #   end
       class MethodMissing < Cop
-        include OnMethodDef
+        MSG = 'When using `method_missing`, %<instructions>s.'.freeze
 
-        MSG = 'When using `method_missing`, %s.'.freeze
-
-        def on_method_def(node, method_name, _args, _body)
-          return unless method_name == :method_missing
+        def on_def(node)
+          return unless node.method?(:method_missing)
 
           check(node)
         end
+        alias on_defs on_def
 
         private
 
         def check(node)
           return if calls_super?(node) && implements_respond_to_missing?(node)
 
-          add_offense(node, :expression)
+          add_offense(node)
         end
 
         def message(node)
@@ -52,7 +50,7 @@ module RuboCop
             instructions << 'fall back on `super`'.freeze
           end
 
-          format(MSG, instructions.join(' and '))
+          format(MSG, instructions: instructions.join(' and '))
         end
 
         def calls_super?(node)
@@ -60,14 +58,10 @@ module RuboCop
         end
 
         def implements_respond_to_missing?(node)
-          node.parent.children.any? do |sibling|
-            respond_to_missing_def?(sibling)
+          node.parent.each_child_node(node.type).any? do |sibling|
+            sibling.method?(:respond_to_missing?)
           end
         end
-
-        def_node_matcher :respond_to_missing_def?, <<-PATTERN
-          (def :respond_to_missing? (...) ...)
-        PATTERN
       end
     end
   end

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Style
+      # This cop checks for potential uses of `Enumerable#minmax`.
+      #
+      # @example
+      #
+      #   # bad
+      #   bar = [foo.min, foo.max]
+      #   return foo.min, foo.max
+      #
+      #   # good
+      #   bar = foo.minmax
+      #   return foo.minmax
+      class MinMax < Cop
+        MSG = 'Use `%<receiver>s.minmax` instead of `%<offender>s`.'.freeze
+
+        def on_array(node)
+          min_max_candidate(node) do |receiver|
+            offender = offending_range(node)
+
+            add_offense(node, location: offender,
+                              message: message(offender, receiver))
+          end
+        end
+        alias on_return on_array
+
+        def autocorrect(node)
+          receiver = node.children.first.receiver
+
+          lambda do |corrector|
+            corrector.replace(offending_range(node),
+                              "#{receiver.source}.minmax")
+          end
+        end
+
+        private
+
+        def_node_matcher :min_max_candidate, <<-PATTERN
+          ({array return} (send [$_receiver !nil?] :min) (send [$_receiver !nil?] :max))
+        PATTERN
+
+        def message(offender, receiver)
+          format(MSG, offender: offender.source,
+                      receiver: receiver.source)
+        end
+
+        def offending_range(node)
+          case node.type
+          when :return
+            argument_range(node)
+          else
+            node.loc.expression
+          end
+        end
+
+        def argument_range(node)
+          first_argument_range = node.children.first.loc.expression
+          last_argument_range  = node.children.last.loc.expression
+
+          first_argument_range.join(last_argument_range)
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -33,40 +32,81 @@ module RuboCop
         include OnNormalIfUnless
         include ConfigurableEnforcedStyle
 
-        MSG = '`%s` condition requires an `else`-clause.'.freeze
-        MSG_NIL = '`%s` condition requires an `else`-clause with ' \
+        MSG = '`%<type>s` condition requires an `else`-clause.'.freeze
+        MSG_NIL = '`%<type>s` condition requires an `else`-clause with ' \
                   '`nil` in it.'.freeze
-        MSG_EMPTY = '`%s` condition requires an empty `else`-clause.'.freeze
+        MSG_EMPTY = '`%<type>s` condition requires an empty ' \
+                    '`else`-clause.'.freeze
 
         def on_normal_if_unless(node)
-          unless_else_cop = config.for_cop('Style/UnlessElse')
-          unless_else_enabled = unless_else_cop['Enabled'] if unless_else_cop
-          return if unless_else_enabled &&
-                    node.loc.keyword &&
-                    node.loc.keyword.is?('unless')
-          check(node, if_else_clause(node)) unless style == :case
+          return if case_style?
+          return if unless_else_cop_enabled? && node.unless?
+
+          check(node)
         end
 
         def on_case(node)
-          check(node, case_else_clause(node)) unless style == :if
+          return if if_style?
+
+          check(node)
         end
 
         private
 
-        def check(node, _else_clause)
-          return if node.loc.else
-          empty_else = config.for_cop('Style/EmptyElse')
+        def check(node)
+          return if node.else?
 
-          if empty_else && empty_else['Enabled']
-            case empty_else['EnforcedStyle']
-            when 'empty'
-              add_offense(node, :expression, format(MSG_NIL, node.type))
-            when 'nil'
-              add_offense(node, :expression, format(MSG_EMPTY, node.type))
+          if empty_else_cop_enabled?
+            if empty_else_style == :empty
+              add_offense(node)
+            elsif empty_else_style == :nil
+              add_offense(node)
             end
           end
 
-          add_offense(node, :expression, format(MSG, node.type))
+          add_offense(node)
+        end
+
+        def message(node)
+          template = case empty_else_style
+                     when :empty
+                       MSG_NIL
+                     when :nil
+                       MSG_EMPTY
+                     else
+                       MSG
+                     end
+
+          format(template, type: node.type)
+        end
+
+        def if_style?
+          style == :if
+        end
+
+        def case_style?
+          style == :case
+        end
+
+        def unless_else_cop_enabled?
+          unless_else_config.fetch('Enabled')
+        end
+
+        def unless_else_config
+          config.for_cop('Style/UnlessElse')
+        end
+
+        def empty_else_cop_enabled?
+          empty_else_config.fetch('Enabled')
+        end
+
+        def empty_else_style
+          return unless empty_else_config.key?('EnforcedStyle')
+          empty_else_config['EnforcedStyle'].to_sym
+        end
+
+        def empty_else_config
+          config.for_cop('Style/EmptyElse')
         end
       end
     end