rubocop 1.9.1 → 1.13.0

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

@@ -15,8 +15,7 @@ module RuboCop
         include IgnoredMethods
         extend AutoCorrector
 
-        MSG = 'Do not use parentheses for method calls with ' \
-              'no arguments.'
+        MSG = 'Do not use parentheses for method calls with no arguments.'
 
         def on_send(node)
           return unless !node.arguments? && node.parenthesized?

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

@@ -40,11 +40,9 @@ module RuboCop
 
           receiver = node.receiver
 
-          return unless receiver&.block_type? &&
-                        receiver.loc.end.is?('end')
+          return unless receiver&.block_type? && receiver.loc.end.is?('end')
 
-          range = range_between(receiver.loc.end.begin_pos,
-                                node.source_range.end_pos)
+          range = range_between(receiver.loc.end.begin_pos, node.source_range.end_pos)
 
           add_offense(range)
         end

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

@@ -93,8 +93,7 @@ module RuboCop
         extend AutoCorrector
 
         MSG_PRESENT = 'Use def without parentheses.'
-        MSG_MISSING = 'Use def with parentheses when there are ' \
-                      'parameters.'
+        MSG_MISSING = 'Use def with parentheses when there are parameters.'
 
         def on_def(node)
           return if node.endless?
@@ -124,18 +123,15 @@ module RuboCop
 
         def correct_definition(def_node, corrector)
           arguments_range = def_node.arguments.source_range
-          args_with_space = range_with_surrounding_space(range: arguments_range,
-                                                         side: :left)
-          leading_space = range_between(args_with_space.begin_pos,
-                                        arguments_range.begin_pos)
+          args_with_space = range_with_surrounding_space(range: arguments_range, side: :left)
+          leading_space = range_between(args_with_space.begin_pos, arguments_range.begin_pos)
           corrector.replace(leading_space, '(')
           corrector.insert_after(arguments_range, ')')
         end
 
         def require_parentheses?(args)
           style == :require_parentheses ||
-            (style == :require_no_parentheses_except_multiline &&
-             args.multiline?)
+            (style == :require_no_parentheses_except_multiline && args.multiline?)
         end
 
         def arguments_without_parentheses?(node)

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

@@ -34,13 +34,13 @@ module RuboCop
 
         private
 
+        # @!method min_max_candidate(node)
         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)
+          format(MSG, offender: offender.source, receiver: receiver.source)
         end
 
         def offending_range(node)

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

@@ -98,10 +98,8 @@ module RuboCop
         include ConfigurableEnforcedStyle
 
         MSG = '`%<type>s` condition requires an `else`-clause.'
-        MSG_NIL = '`%<type>s` condition requires an `else`-clause with ' \
-                  '`nil` in it.'
-        MSG_EMPTY = '`%<type>s` condition requires an empty ' \
-                    '`else`-clause.'
+        MSG_NIL = '`%<type>s` condition requires an `else`-clause with `nil` in it.'
+        MSG_EMPTY = '`%<type>s` condition requires an empty `else`-clause.'
 
         def on_normal_if_unless(node)
           return if case_style?

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

@@ -22,8 +22,7 @@ module RuboCop
       #   end
       #
       class MissingRespondToMissing < Base
-        MSG =
-          'When using `method_missing`, define `respond_to_missing?`.'
+        MSG = 'When using `method_missing`, define `respond_to_missing?`.'
 
         def on_def(node)
           return unless node.method?(:method_missing)

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

@@ -53,8 +53,7 @@ module RuboCop
         def range_to_remove_for_subsequent_mixin(mixins, node)
           range = node.loc.expression
           prev_mixin = mixins.each_cons(2) { |m, n| break m if n == node }
-          between = prev_mixin.loc.expression.end
-                              .join(range.begin)
+          between = prev_mixin.loc.expression.end.join(range.begin)
           # if separated from previous mixin with only whitespace?
           unless /\S/.match?(between.source)
             range = range.join(between) # then remove that too
@@ -103,12 +102,9 @@ module RuboCop
         end
 
         def sibling_mixins(send_node)
-          siblings = send_node.parent.each_child_node(:send)
-                              .select(&:macro?)
+          siblings = send_node.parent.each_child_node(:send).select(&:macro?)
 
-          siblings.select do |sibling_node|
-            sibling_node.method?(send_node.method_name)
-          end
+          siblings.select { |sibling_node| sibling_node.method?(send_node.method_name) }
         end
 
         def grouped_style?
@@ -129,9 +125,7 @@ module RuboCop
         end
 
         def group_mixins(node, mixins)
-          mixin_names = mixins.reverse.flat_map do |mixin|
-            mixin.arguments.map(&:source)
-          end
+          mixin_names = mixins.reverse.flat_map { |mixin| mixin.arguments.map(&:source) }
 
           "#{node.method_name} #{mixin_names.join(', ')}"
         end

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

@@ -41,15 +41,16 @@ module RuboCop
       #     prepend M
       #   end
       class MixinUsage < Base
-        MSG = '`%<statement>s` is used at the top level. Use inside `class` ' \
-              'or `module`.'
+        MSG = '`%<statement>s` is used at the top level. Use inside `class` or `module`.'
         RESTRICT_ON_SEND = %i[include extend prepend].freeze
 
+        # @!method include_statement(node)
         def_node_matcher :include_statement, <<~PATTERN
           (send nil? ${:include :extend :prepend}
             const)
         PATTERN
 
+        # @!method in_top_level_scope?(node)
         def_node_matcher :in_top_level_scope?, <<~PATTERN
           {
             root?                        # either at the top level

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

@@ -75,15 +75,17 @@ module RuboCop
         include ConfigurableEnforcedStyle
         extend AutoCorrector
 
-        MODULE_FUNCTION_MSG =
-          'Use `module_function` instead of `extend self`.'
-        EXTEND_SELF_MSG =
-          'Use `extend self` instead of `module_function`.'
-        FORBIDDEN_MSG =
-          'Do not use `module_function` or `extend self`.'
+        MODULE_FUNCTION_MSG = 'Use `module_function` instead of `extend self`.'
+        EXTEND_SELF_MSG = 'Use `extend self` instead of `module_function`.'
+        FORBIDDEN_MSG = 'Do not use `module_function` or `extend self`.'
 
+        # @!method module_function_node?(node)
         def_node_matcher :module_function_node?, '(send nil? :module_function)'
+
+        # @!method extend_self_node?(node)
         def_node_matcher :extend_self_node?, '(send nil? :extend self)'
+
+        # @!method private_directive?(node)
         def_node_matcher :private_directive?, '(send nil? :private ...)'
 
         def on_module(node)

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

@@ -33,8 +33,7 @@ module RuboCop
 
             next unless receiver&.block_type? && receiver&.multiline?
 
-            range = range_between(receiver.loc.end.begin_pos,
-                                  node.send_node.source_range.end_pos)
+            range = range_between(receiver.loc.end.begin_pos, node.send_node.source_range.end_pos)
 
             add_offense(range)
 

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

@@ -29,9 +29,7 @@ module RuboCop
           return if opening_line(node) == closing_line(node)
           return if correction_exceeds_max_line_length?(node)
 
-          add_offense(node) do |corrector|
-            autocorrect(corrector, node)
-          end
+          add_offense(node) { |corrector| autocorrect(corrector, node) }
         end
         alias on_defs on_def
 
@@ -40,7 +38,7 @@ module RuboCop
         def autocorrect(corrector, node)
           arguments = node.arguments
           joined_arguments = arguments.map(&:source).join(', ')
-          last_line_source_of_arguments = processed_source[arguments.last_line - 1].strip
+          last_line_source_of_arguments = last_line_source_of_arguments(arguments)
 
           if last_line_source_of_arguments.start_with?(')')
             joined_arguments = "#{joined_arguments}#{last_line_source_of_arguments}"
@@ -48,13 +46,20 @@ module RuboCop
             corrector.remove(range_by_whole_lines(arguments.loc.end, include_final_newline: true))
           end
 
-          corrector.replace(arguments_range(node), joined_arguments)
+          corrector.remove(arguments_range(node))
+          corrector.insert_after(arguments.loc.begin, joined_arguments)
+        end
+
+        def last_line_source_of_arguments(arguments)
+          processed_source[arguments.last_line - 1].strip
         end
 
         def arguments_range(node)
-          range_between(
+          range = range_between(
             node.first_argument.source_range.begin_pos, node.last_argument.source_range.end_pos
           )
+
+          range_with_surrounding_space(range: range, side: :left)
         end
 
         def opening_line(node)

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

@@ -28,8 +28,7 @@ module RuboCop
       class MultilineTernaryOperator < Base
         extend AutoCorrector
 
-        MSG = 'Avoid multi-line ternary operators, ' \
-              'use `if` or `unless` instead.'
+        MSG = 'Avoid multi-line ternary operators, use `if` or `unless` instead.'
 
         def on_if(node)
           return unless offense?(node)

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

@@ -47,11 +47,12 @@ module RuboCop
           'in a conditional, use `Array#include?` instead.'
 
         def on_new_investigation
-          @compared_elements = []
-          @allowed_method_comparison = false
+          @last_comparison = nil
         end
 
         def on_or(node)
+          reset_comparison if switch_comparison?(node)
+
           root_of_or_node = root_of_or_node(node)
 
           return unless node == root_of_or_node
@@ -64,14 +65,21 @@ module RuboCop
 
             corrector.replace(node, prefer_method)
           end
+
+          @last_comparison = node
         end
 
         private
 
+        # @!method simple_double_comparison?(node)
         def_node_matcher :simple_double_comparison?, '(send $lvar :== $lvar)'
+
+        # @!method simple_comparison_lhs?(node)
         def_node_matcher :simple_comparison_lhs?, <<~PATTERN
           (send $lvar :== $_)
         PATTERN
+
+        # @!method simple_comparison_rhs?(node)
         def_node_matcher :simple_comparison_rhs?, <<~PATTERN
           (send $_ :== $lvar)
         PATTERN
@@ -84,9 +92,7 @@ module RuboCop
 
         def variables_in_node(node)
           if node.or_type?
-            node.node_parts
-                .flat_map { |node_part| variables_in_node(node_part) }
-                .uniq
+            node.node_parts.flat_map { |node_part| variables_in_node(node_part) }.uniq
           else
             variables_in_simple_node(node)
           end
@@ -131,6 +137,17 @@ module RuboCop
           end
         end
 
+        def switch_comparison?(node)
+          return true if @last_comparison.nil?
+
+          @last_comparison.descendants.none?(node)
+        end
+
+        def reset_comparison
+          @compared_elements = []
+          @allowed_method_comparison = false
+        end
+
         def allow_method_comparison?
           cop_config.fetch('AllowMethodComparison', true)
         end

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

@@ -87,9 +87,7 @@ module RuboCop
           return if operation_produces_immutable_object?(value)
           return if frozen_string_literal?(value)
 
-          add_offense(value) do |corrector|
-            autocorrect(corrector, value)
-          end
+          add_offense(value) { |corrector| autocorrect(corrector, value) }
         end
 
         def check(value)
@@ -101,9 +99,7 @@ module RuboCop
           return if FROZEN_STRING_LITERAL_TYPES.include?(value.type) &&
                     frozen_string_literals_enabled?
 
-          add_offense(value) do |corrector|
-            autocorrect(corrector, value)
-          end
+          add_offense(value) { |corrector| autocorrect(corrector, value) }
         end
 
         def autocorrect(corrector, node)
@@ -133,8 +129,7 @@ module RuboCop
         end
 
         def frozen_string_literal?(node)
-          FROZEN_STRING_LITERAL_TYPES.include?(node.type) &&
-            frozen_string_literals_enabled?
+          FROZEN_STRING_LITERAL_TYPES.include?(node.type) && frozen_string_literals_enabled?
         end
 
         def frozen_regexp_or_range_literals?(node)
@@ -142,8 +137,7 @@ module RuboCop
         end
 
         def requires_parentheses?(node)
-          node.range_type? ||
-            (node.send_type? && node.loc.dot.nil?)
+          node.range_type? || (node.send_type? && node.loc.dot.nil?)
         end
 
         def correct_splat_expansion(corrector, expr, splat_value)
@@ -154,12 +148,14 @@ module RuboCop
           end
         end
 
+        # @!method splat_value(node)
         def_node_matcher :splat_value, <<~PATTERN
           (array (splat $_))
         PATTERN
 
         # Some of these patterns may not actually return an immutable object,
         # but we want to consider them immutable for this cop.
+        # @!method operation_produces_immutable_object?(node)
         def_node_matcher :operation_produces_immutable_object?, <<~PATTERN
           {
             (const _ _)
@@ -176,6 +172,7 @@ module RuboCop
           }
         PATTERN
 
+        # @!method range_enclosed_in_parentheses?(node)
         def_node_matcher :range_enclosed_in_parentheses?, <<~PATTERN
           (begin ({irange erange} _ _))
         PATTERN

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

@@ -90,8 +90,7 @@ module RuboCop
         end
 
         def correct_style?(node)
-          style == :prefix && node.modifier_form? ||
-            style == :postfix && !node.modifier_form?
+          style == :prefix && node.modifier_form? || style == :postfix && !node.modifier_form?
         end
       end
     end

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

@@ -29,12 +29,14 @@ module RuboCop
       #
       class NegatedIfElseCondition < Base
         include RangeHelp
+        include CommentsHelp
         extend AutoCorrector
 
         MSG = 'Invert the negated condition and swap the %<type>s branches.'
 
         NEGATED_EQUALITY_METHODS = %i[!= !~].freeze
 
+        # @!method double_negation?(node)
         def_node_matcher :double_negation?, '(send (send _ :!) :!)'
 
         def self.autocorrect_incompatible_with
@@ -96,10 +98,22 @@ module RuboCop
           if node.if_branch.nil?
             corrector.remove(range_by_whole_lines(node.loc.else, include_final_newline: true))
           else
-            corrector.replace(node.if_branch, node.else_branch.source)
-            corrector.replace(node.else_branch, node.if_branch.source)
+            if_range = node_with_comments(node.if_branch)
+            else_range = node_with_comments(node.else_branch)
+
+            corrector.replace(if_range, else_range.source)
+            corrector.replace(else_range, if_range.source)
           end
         end
+
+        def node_with_comments(node)
+          first_statement = node.begin_type? ? node.children[0] : node
+          return node if processed_source.ast_with_comments[first_statement].empty?
+
+          begin_pos = source_range_with_comment(first_statement).begin_pos
+          end_pos = node.source_range.end_pos
+          Parser::Source::Range.new(buffer, begin_pos, end_pos)
+        end
       end
     end
   end

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

@@ -80,8 +80,7 @@ module RuboCop
         end
 
         def correct_style?(node)
-          style == :prefix && node.modifier_form? ||
-            style == :postfix && !node.modifier_form?
+          style == :prefix && node.modifier_form? || style == :postfix && !node.modifier_form?
         end
       end
     end

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

@@ -31,9 +31,7 @@ module RuboCop
           return if part_of_ignored_node?(node)
           return unless modifier?(node) && modifier?(node.parent)
 
-          add_offense(node.loc.keyword) do |corrector|
-            autocorrect(corrector, node)
-          end
+          add_offense(node.loc.keyword) { |corrector| autocorrect(corrector, node) }
           ignore_node(node)
         end
 
@@ -66,8 +64,7 @@ module RuboCop
 
         def left_hand_operand(node, operator)
           expr = node.condition.source
-          expr = "(#{expr})" if node.condition.or_type? &&
-                                operator == '&&'
+          expr = "(#{expr})" if node.condition.or_type? && operator == '&&'
           expr
         end
 
@@ -95,8 +92,7 @@ module RuboCop
         end
 
         def requires_parens?(node)
-          node.or_type? ||
-            !(RuboCop::AST::Node::COMPARISON_OPERATORS & node.children).empty?
+          node.or_type? || !(RuboCop::AST::Node::COMPARISON_OPERATORS & node.children).empty?
         end
       end
     end