rubocop 0.49.1 → 0.52.0

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

@@ -5,13 +5,19 @@ module RuboCop
     module Style
       # This cop checks for use of the lambda.(args) syntax.
       #
-      # @example
-      #
+      # @example EnforcedStyle: call (default)
       #  # bad
       #  lambda.(x, y)
       #
       #  # good
       #  lambda.call(x, y)
+      #
+      # @example EnforcedStyle: braces
+      #  # bad
+      #  lambda.call(x, y)
+      #
+      #  # good
+      #  lambda.(x, y)
       class LambdaCall < Cop
         include ConfigurableEnforcedStyle
 
@@ -19,19 +25,12 @@ module RuboCop
           return unless node.receiver && node.method?(:call)
 
           if offense?(node)
-            add_offense(node, :expression) { opposite_style_detected }
+            add_offense(node) { opposite_style_detected }
           else
             correct_style_detected
           end
         end
 
-        private
-
-        def offense?(node)
-          explicit_style? && node.implicit_call? ||
-            implicit_style? && !node.implicit_call?
-        end
-
         def autocorrect(node)
           lambda do |corrector|
             if explicit_style?
@@ -40,11 +39,39 @@ module RuboCop
 
               corrector.replace(node.source_range, replacement)
             else
+              add_parentheses(node, corrector) unless node.parenthesized?
               corrector.remove(node.loc.selector)
             end
           end
         end
 
+        private
+
+        def offense?(node)
+          explicit_style? && node.implicit_call? ||
+            implicit_style? && !node.implicit_call?
+        end
+
+        def add_parentheses(node, corrector)
+          if node.arguments.empty?
+            corrector.insert_after(node.source_range, '()')
+          else
+            corrector.replace(args_begin(node), '(')
+            corrector.insert_after(args_end(node), ')')
+          end
+        end
+
+        def args_begin(node)
+          loc = node.loc
+          selector =
+            node.super_type? || node.yield_type? ? loc.keyword : loc.selector
+          selector.end.resize(1)
+        end
+
+        def args_end(node)
+          node.loc.expression.end
+        end
+
         def message(_node)
           if explicit_style?
             'Prefer the use of `lambda.call(...)` over `lambda.(...)`.'

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

@@ -41,9 +41,9 @@ module RuboCop
 
         def autocorrect(operator_range)
           # Include any trailing whitespace so we don't create a syntax error.
-          operator_range = range_with_surrounding_space(operator_range,
-                                                        :right,
-                                                        false)
+          operator_range = range_with_surrounding_space(range: operator_range,
+                                                        side: :right,
+                                                        newlines: false)
           one_more_char = operator_range.resize(operator_range.size + 1)
           # Don't create a double backslash at the end of the line, in case
           # there already was a backslash after the concatenation operator.
@@ -61,13 +61,13 @@ module RuboCop
                         eligible_operator?(operator) &&
                         eligible_predecessor?(predecessor)
 
-          return if operator.pos.line == successor.pos.line
+          return if operator.line == successor.line
 
           next_successor = token_after_last_string(successor, index)
 
           return unless eligible_next_successor?(next_successor)
 
-          add_offense(operator.pos, operator.pos)
+          add_offense(operator.pos, location: operator.pos)
         end
 
         def eligible_successor?(successor)

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

@@ -46,22 +46,10 @@ module RuboCop
           return if ignored_method?(node)
           return unless node.arguments? && !node.parenthesized?
 
-          add_offense(node, :selector)
-        end
-
-        def on_super(node)
-          return if node.parenthesized?
-
-          add_offense(node, :keyword)
-        end
-
-        def on_yield(node)
-          args = node.children
-          return if args.empty?
-          return if parentheses?(node)
-
-          add_offense(node, :keyword)
+          add_offense(node)
         end
+        alias on_super on_send
+        alias on_yield on_send
 
         def autocorrect(node)
           lambda do |corrector|
@@ -86,10 +74,6 @@ module RuboCop
           cop_config['IgnoreMacros']
         end
 
-        def parentheses?(node)
-          node.loc.begin
-        end
-
         def args_begin(node)
           loc = node.loc
           selector =

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

@@ -18,13 +18,11 @@ module RuboCop
         ASGN_NODES = %i[lvasgn masgn] + SHORTHAND_ASGN_NODES
 
         def on_send(node)
-          return if node.camel_case_method?
+          return if ineligible_node?(node)
           return unless !node.arguments? && node.parenthesized?
           return if same_name_assignment?(node)
-          return if node.implicit_call?
-          return if node.keyword_not?
 
-          add_offense(node, :begin)
+          add_offense(node, location: :begin)
         end
 
         def autocorrect(node)
@@ -36,6 +34,10 @@ module RuboCop
 
         private
 
+        def ineligible_node?(node)
+          node.camel_case_method? || node.implicit_call? || node.keyword_not?
+        end
+
         def same_name_assignment?(node)
           any_assignment?(node) do |asgn_node|
             if asgn_node.masgn_type?

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

@@ -35,7 +35,7 @@ module RuboCop
           range = range_between(receiver.loc.end.begin_pos,
                                 node.source_range.end_pos)
 
-          add_offense(nil, range)
+          add_offense(nil, location: range)
         end
       end
     end

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

@@ -6,13 +6,18 @@ module RuboCop
       # This cops checks for parentheses around the arguments in method
       # definitions. Both instance and class/singleton methods are checked.
       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
@@ -22,6 +27,7 @@ module RuboCop
             correct_style_detected
           end
         end
+        alias on_defs on_def
 
         def autocorrect(node)
           lambda do |corrector|
@@ -30,8 +36,9 @@ 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)
+              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, '(')
@@ -48,35 +55,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.def_type?
-            _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

@@ -8,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)
@@ -51,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,21 +59,9 @@ module RuboCop
 
         def implements_respond_to_missing?(node)
           node.parent.each_child_node(node.type).any? do |sibling|
-            if node.def_type?
-              respond_to_missing_def?(sibling)
-            elsif node.defs_type?
-              respond_to_missing_defs?(sibling)
-            end
+            sibling.method?(:respond_to_missing?)
           end
         end
-
-        def_node_matcher :respond_to_missing_def?, <<-PATTERN
-          (def :respond_to_missing? (...) ...)
-        PATTERN
-
-        def_node_matcher :respond_to_missing_defs?, <<-PATTERN
-          (defs (self) :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

@@ -32,10 +32,11 @@ 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)
           return if case_style?
@@ -57,13 +58,26 @@ module RuboCop
 
           if empty_else_cop_enabled?
             if empty_else_style == :empty
-              add_offense(node, :expression, format(MSG_NIL, node.type))
+              add_offense(node)
             elsif empty_else_style == :nil
-              add_offense(node, :expression, format(MSG_EMPTY, node.type))
+              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?