rubocop 1.11.0 → 1.15.0

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

@@ -5,6 +5,7 @@ module RuboCop
     module Style
       class MethodCallWithArgsParentheses
         # Style omit_parentheses
+        # rubocop:disable Metrics/ModuleLength, Metrics/CyclomaticComplexity
         module OmitParentheses
           TRAILING_WHITESPACE_REGEX = /\s+\Z/.freeze
           OMIT_MSG = 'Omit parentheses for method calls with arguments.'
@@ -15,10 +16,11 @@ module RuboCop
           def omit_parentheses(node)
             return unless node.parenthesized?
             return if inside_endless_method_def?(node)
-            return if node.implicit_call?
+            return if syntax_like_method_call?(node)
             return if super_call_without_arguments?(node)
             return if allowed_camel_case_method_call?(node)
             return if legitimate_call_with_parentheses?(node)
+            return if allowed_string_interpolation_method_call?(node)
 
             add_offense(offense_range(node), message: OMIT_MSG) do |corrector|
               auto_correct(corrector, node)
@@ -40,7 +42,11 @@ module RuboCop
 
           def inside_endless_method_def?(node)
             # parens are required around arguments inside an endless method
-            node.each_ancestor(:def).any?(&:endless?) && node.arguments.any?
+            node.each_ancestor(:def, :defs).any?(&:endless?) && node.arguments.any?
+          end
+
+          def syntax_like_method_call?(node)
+            node.implicit_call? || node.operator_method?
           end
 
           def super_call_without_arguments?(node)
@@ -49,8 +55,12 @@ module RuboCop
 
           def allowed_camel_case_method_call?(node)
             node.camel_case_method? &&
-              (node.arguments.none? ||
-              cop_config['AllowParenthesesInCamelCaseMethod'])
+              (node.arguments.none? || cop_config['AllowParenthesesInCamelCaseMethod'])
+          end
+
+          def allowed_string_interpolation_method_call?(node)
+            cop_config['AllowParenthesesInStringInterpolation'] &&
+              inside_string_interpolation?(node)
           end
 
           def parentheses_at_the_end_of_multiline_call?(node)
@@ -88,8 +98,7 @@ module RuboCop
           end
 
           def call_in_optional_arguments?(node)
-            node.parent &&
-              (node.parent.optarg_type? || node.parent.kwoptarg_type?)
+            node.parent && (node.parent.optarg_type? || node.parent.kwoptarg_type?)
           end
 
           def call_in_single_line_inheritance?(node)
@@ -101,20 +110,19 @@ module RuboCop
               call_as_argument_or_chain?(node) ||
               hash_literal_in_arguments?(node) ||
               node.descendants.any? do |n|
-                ambigious_literal?(n) || logical_operator?(n) ||
+                n.forwarded_args_type? || ambigious_literal?(n) || logical_operator?(n) ||
                   call_with_braced_block?(n)
               end
           end
 
           def call_with_braced_block?(node)
-            (node.send_type? || node.super_type?) &&
-              node.block_node && node.block_node.braces?
+            (node.send_type? || node.super_type?) && node.block_node && node.block_node.braces?
           end
 
           def call_as_argument_or_chain?(node)
             node.parent &&
               (node.parent.send_type? && !assigned_before?(node.parent, node) ||
-              node.parent.csend_type? || node.parent.super_type?)
+              node.parent.csend_type? || node.parent.super_type? || node.parent.yield_type?)
           end
 
           def hash_literal_in_arguments?(node)
@@ -134,13 +142,11 @@ module RuboCop
             previous = node.descendants.first
             return false unless previous&.send_type?
 
-            previous.parenthesized? ||
-              allowed_chained_call_with_parentheses?(previous)
+            previous.parenthesized? || allowed_chained_call_with_parentheses?(previous)
           end
 
           def ambigious_literal?(node)
-            splat?(node) || ternary_if?(node) || regexp_slash_literal?(node) ||
-              unary_literal?(node)
+            splat?(node) || ternary_if?(node) || regexp_slash_literal?(node) || unary_literal?(node)
           end
 
           def splat?(node)
@@ -169,10 +175,14 @@ module RuboCop
           end
 
           def assigned_before?(node, target)
-            node.assignment? &&
-              node.loc.operator.begin < target.loc.begin
+            node.assignment? && node.loc.operator.begin < target.loc.begin
+          end
+
+          def inside_string_interpolation?(node)
+            node.ancestors.drop_while { |a| !a.begin_type? }.any?(&:dstr_type?)
           end
         end
+        # rubocop:enable Metrics/ModuleLength, Metrics/CyclomaticComplexity
       end
     end
   end

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

@@ -40,8 +40,7 @@ module RuboCop
         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,8 +41,7 @@ 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)

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

@@ -75,12 +75,9 @@ 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)'

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

@@ -92,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
@@ -142,7 +140,7 @@ module RuboCop
         def switch_comparison?(node)
           return true if @last_comparison.nil?
 
-          @last_comparison.descendants.none? { |descendant| descendant == node }
+          @last_comparison.descendants.none?(node)
         end
 
         def reset_comparison

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)

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

@@ -97,8 +97,29 @@ 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 = if_range(node)
+            else_range = else_range(node)
+
+            corrector.replace(if_range, else_range.source)
+            corrector.replace(else_range, if_range.source)
+          end
+        end
+
+        # Collect the entire if branch, including whitespace and comments
+        def if_range(node)
+          if node.ternary?
+            node.if_branch
+          else
+            range_between(node.condition.loc.expression.end_pos, node.loc.else.begin_pos)
+          end
+        end
+
+        # Collect the entire else branch, including whitespace and comments
+        def else_range(node)
+          if node.ternary?
+            node.else_branch
+          else
+            range_between(node.loc.else.end_pos, node.loc.end.begin_pos)
           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