rubocop 0.78.0 → 1.13.0

data/lib/rubocop/cop/mixin/method_preference.rb

@@ -18,8 +18,7 @@ module RuboCop
             default = default_cop_config['PreferredMethods']
             merged = cop_config['PreferredMethods']
             overrides = merged.values - default.values
-            merged.reject { |key, _| overrides.include?(key) }
-                  .map { |k, v| [k.to_sym, v] }.to_h
+            merged.reject { |key, _| overrides.include?(key) }.transform_keys(&:to_sym)
           end
       end
 

data/lib/rubocop/cop/mixin/multiline_element_indentation.rb

@@ -28,8 +28,7 @@ module RuboCop
         expected_column = base_column(left_brace, left_parenthesis) +
                           configured_indentation_width + offset
         @column_delta = expected_column - actual_column
-        styles =
-          detected_styles(actual_column, offset, left_parenthesis, left_brace)
+        styles = detected_styles(actual_column, offset, left_parenthesis, left_brace)
 
         if @column_delta.zero?
           check_expected_style(styles)
@@ -77,7 +76,9 @@ module RuboCop
       def incorrect_style_detected(styles, first, left_parenthesis)
         msg = message(base_description(left_parenthesis))
 
-        add_offense(first, message: msg) do
+        add_offense(first, message: msg) do |corrector|
+          autocorrect(corrector, first)
+
           ambiguous_style_detected(*styles)
         end
       end

data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb

@@ -16,7 +16,7 @@ module RuboCop
         last_seen_line = -1
         children.each do |child|
           if last_seen_line >= child.first_line
-            add_offense(child)
+            add_offense(child) { |corrector| EmptyLineCorrector.insert_before(corrector, child) }
           else
             last_seen_line = child.last_line
           end

data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb

@@ -6,12 +6,10 @@ module RuboCop
     # operations.
     module MultilineExpressionIndentation # rubocop:disable Metrics/ModuleLength
       KEYWORD_ANCESTOR_TYPES  = %i[for if while until return].freeze
-      UNALIGNED_RHS_TYPES     = %i[if while until for return
-                                   array kwbegin].freeze
+      UNALIGNED_RHS_TYPES     = %i[if while until for return array kwbegin].freeze
       DEFAULT_MESSAGE_TAIL    = 'an expression'
       ASSIGNMENT_MESSAGE_TAIL = 'an expression in an assignment'
-      KEYWORD_MESSAGE_TAIL    = 'a %<kind>s in %<article>s `%<keyword>s` ' \
-                                'statement'
+      KEYWORD_MESSAGE_TAIL    = 'a %<kind>s in %<article>s `%<keyword>s` statement'
 
       def on_send(node)
         return if !node.receiver || node.method?(:[])
@@ -31,30 +29,10 @@ module RuboCop
       #   b c { block }.            <-- b is indented relative to a
       #   d                         <-- d is indented relative to a
       def left_hand_side(lhs)
-        lhs = lhs.parent while lhs.parent&.send_type?
+        lhs = lhs.parent while lhs.parent&.send_type? && lhs.parent.loc.dot
         lhs
       end
 
-      def right_hand_side(send_node)
-        if send_node.operator_method? && send_node.arguments?
-          send_node.first_argument.source_range # not used for method calls
-        else
-          regular_method_right_hand_side(send_node)
-        end
-      end
-
-      def regular_method_right_hand_side(send_node)
-        dot = send_node.loc.dot
-        selector = send_node.loc.selector
-        if send_node.dot? && selector && dot.line == selector.line
-          dot.join(selector)
-        elsif selector
-          selector
-        elsif send_node.implicit_call?
-          dot.join(send_node.loc.begin)
-        end
-      end
-
       # The correct indentation of `node` is usually `IndentationWidth`, with
       # one exception: prefix keywords.
       #
@@ -75,8 +53,7 @@ module RuboCop
         kw_node = kw_node_with_special_indentation(node)
         if kw_node && !postfix_conditional?(kw_node)
           # This cop could have its own IndentationWidth configuration
-          configured_indentation_width +
-            @config.for_cop('Layout/IndentationWidth')['Width']
+          configured_indentation_width + @config.for_cop('Layout/IndentationWidth')['Width']
         else
           configured_indentation_width
         end
@@ -91,9 +68,10 @@ module RuboCop
       end
 
       def incorrect_style_detected(range, node, lhs, rhs)
-        add_offense(range, location: range, message: message(node, lhs, rhs)) do
-          if supported_styles.size > 2 ||
-             offending_range(node, lhs, rhs, alternative_style)
+        add_offense(range, message: message(node, lhs, rhs)) do |corrector|
+          autocorrect(corrector, range)
+
+          if supported_styles.size > 2 || offending_range(node, lhs, rhs, alternative_style)
             unrecognized_style_detected
           else
             opposite_style_detected
@@ -110,9 +88,7 @@ module RuboCop
           return keyword_message_tail(ancestor)
         end
 
-        part_of_assignment_rhs(node, rhs) do |_node|
-          return ASSIGNMENT_MESSAGE_TAIL
-        end
+        part_of_assignment_rhs(node, rhs) { |_node| return ASSIGNMENT_MESSAGE_TAIL }
 
         DEFAULT_MESSAGE_TAIL
       end
@@ -122,9 +98,7 @@ module RuboCop
         kind    = keyword == 'for' ? 'collection' : 'condition'
         article = keyword.start_with?('i', 'u') ? 'an' : 'a'
 
-        format(KEYWORD_MESSAGE_TAIL, kind: kind,
-                                     article: article,
-                                     keyword: keyword)
+        format(KEYWORD_MESSAGE_TAIL, kind: kind, article: article, keyword: keyword)
       end
 
       def kw_node_with_special_indentation(node)
@@ -152,7 +126,7 @@ module RuboCop
         expression
       end
 
-      def argument_in_method_call(node, kind)
+      def argument_in_method_call(node, kind) # rubocop:todo Metrics/CyclomaticComplexity
         node.each_ancestor(:send, :block).find do |a|
           # If the node is inside a block, it makes no difference if that block
           # is an argument in a method call. It doesn't count.
@@ -162,9 +136,7 @@ module RuboCop
           next unless kind == :with_or_without_parentheses ||
                       kind == :with_parentheses && parentheses?(a)
 
-          a.arguments.any? do |arg|
-            within_node?(node, arg)
-          end
+          a.arguments.any? { |arg| within_node?(node, arg) }
         end
       end
 
@@ -199,8 +171,7 @@ module RuboCop
 
       # The []= operator and setters (a.b = c) are parsed as :send nodes.
       def valid_method_rhs_candidate?(candidate, node)
-        node.setter_method? &&
-          valid_rhs_candidate?(candidate, node.last_argument)
+        node.setter_method? && valid_rhs_candidate?(candidate, node.last_argument)
       end
 
       def valid_rhs_candidate?(candidate, node)

data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb

@@ -24,11 +24,9 @@ module RuboCop
       #    b # comment
       #   ].some_method
       def new_line_needed_before_closing_brace?(node)
-        last_element_line =
-          last_element_range_with_trailing_comma(node).last_line
+        last_element_line = last_element_range_with_trailing_comma(node).last_line
 
-        last_element_commented =
-          processed_source.comments.any? { |c| c.loc.line == last_element_line }
+        last_element_commented = processed_source.comment_at_line(last_element_line)
 
         last_element_commented && (node.chained? || node.argument?)
       end
@@ -44,30 +42,32 @@ module RuboCop
       def check_new_line(node)
         return unless closing_brace_on_same_line?(node)
 
-        add_offense(node,
-                    location: :end,
-                    message: self.class::ALWAYS_NEW_LINE_MESSAGE)
+        add_offense(node.loc.end, message: self.class::ALWAYS_NEW_LINE_MESSAGE) do |corrector|
+          MultilineLiteralBraceCorrector.correct(corrector, node, processed_source)
+        end
       end
 
       def check_same_line(node)
         return if closing_brace_on_same_line?(node)
 
-        add_offense(node,
-                    location: :end,
-                    message: self.class::ALWAYS_SAME_LINE_MESSAGE)
+        add_offense(node.loc.end, message: self.class::ALWAYS_SAME_LINE_MESSAGE) do |corrector|
+          MultilineLiteralBraceCorrector.correct(corrector, node, processed_source)
+        end
       end
 
       def check_symmetrical(node)
         if opening_brace_on_same_line?(node)
           return if closing_brace_on_same_line?(node)
 
-          add_offense(node, location: :end,
-                            message: self.class::SAME_LINE_MESSAGE)
+          add_offense(node.loc.end, message: self.class::SAME_LINE_MESSAGE) do |corrector|
+            MultilineLiteralBraceCorrector.correct(corrector, node, processed_source)
+          end
         else
           return unless closing_brace_on_same_line?(node)
 
-          add_offense(node, location: :end,
-                            message: self.class::NEW_LINE_MESSAGE)
+          add_offense(node.loc.end, message: self.class::NEW_LINE_MESSAGE) do |corrector|
+            MultilineLiteralBraceCorrector.correct(corrector, node, processed_source)
+          end
         end
       end
 

data/lib/rubocop/cop/mixin/negative_conditional.rb

@@ -7,15 +7,17 @@ module RuboCop
     module NegativeConditional
       extend NodePattern::Macros
 
-      MSG = 'Favor `%<inverse>s` over `%<current>s` for ' \
-            'negative conditions.'
+      MSG = 'Favor `%<inverse>s` over `%<current>s` for negative conditions.'
 
       private
 
+      # @!method single_negative?(node)
       def_node_matcher :single_negative?, '(send !(send _ :!) :!)'
+
+      # @!method empty_condition?(node)
       def_node_matcher :empty_condition?, '(begin)'
 
-      def check_negative_conditional(node)
+      def check_negative_conditional(node, message:, &block)
         condition = node.condition
 
         return if empty_condition?(condition)
@@ -25,7 +27,7 @@ module RuboCop
         return unless single_negative?(condition)
         return if node.if_type? && node.else?
 
-        add_offense(node)
+        add_offense(node, message: message, &block)
       end
     end
   end

data/lib/rubocop/cop/mixin/nil_methods.rb

@@ -7,19 +7,17 @@ module RuboCop
     # 2. Added to NilClass by explicitly requiring any standard libraries
     # 3. Cop's configuration parameter AllowedMethods.
     module NilMethods
+      include AllowedMethods
+
       private
 
       def nil_methods
-        nil.methods + other_stdlib_methods + allowed_methods
+        nil.methods + other_stdlib_methods + allowed_methods.map(&:to_sym)
       end
 
       def other_stdlib_methods
         [:to_d]
       end
-
-      def allowed_methods
-        cop_config['AllowedMethods'].map(&:to_sym)
-      end
     end
   end
 end

data/lib/rubocop/cop/mixin/ordered_gem_node.rb

@@ -15,15 +15,17 @@ module RuboCop
         node.source_range
       end
 
+      def gem_canonical_name(name)
+        name = name.tr('-_', '') unless cop_config['ConsiderPunctuation']
+        name.downcase
+      end
+
       def case_insensitive_out_of_order?(string_a, string_b)
-        string_a.downcase < string_b.downcase
+        gem_canonical_name(string_a) < gem_canonical_name(string_b)
       end
 
       def consecutive_lines(previous, current)
-        first_line = get_source_range(
-          current,
-          treat_comments_as_separators
-        ).first_line
+        first_line = get_source_range(current, treat_comments_as_separators).first_line
         previous.source_range.last_line == first_line - 1
       end
 

data/lib/rubocop/cop/mixin/parentheses.rb

@@ -9,8 +9,7 @@ module RuboCop
       def parens_required?(node)
         range  = node.source_range
         source = range.source_buffer.source
-        source[range.begin_pos - 1] =~ /[a-z]/ ||
-          source[range.end_pos] =~ /[a-z]/
+        /[a-z]/.match?(source[range.begin_pos - 1]) || /[a-z]/.match?(source[range.end_pos])
       end
     end
   end

data/lib/rubocop/cop/mixin/percent_array.rb

@@ -28,24 +28,29 @@ module RuboCop
       end
 
       def comments_in_array?(node)
-        comments = processed_source.comments
-        array_range = node.source_range.to_a
-
-        comments.any? do |comment|
-          !(comment.loc.expression.to_a & array_range).empty?
-        end
+        line_span = node.source_range.first_line...node.source_range.last_line
+        processed_source.each_comment_in_lines(line_span).any?
       end
 
       def check_percent_array(node)
         array_style_detected(:percent, node.values.size)
-        add_offense(node) if style == :brackets
+
+        return unless style == :brackets
+
+        add_offense(node) { |corrector| correct_bracketed(corrector, node) }
       end
 
-      def check_bracketed_array(node)
+      def check_bracketed_array(node, literal_prefix)
         return if allowed_bracket_array?(node)
 
         array_style_detected(:brackets, node.values.size)
-        add_offense(node) if style == :percent
+
+        return unless style == :percent
+
+        add_offense(node) do |corrector|
+          percent_literal_corrector = PercentLiteralCorrector.new(@config, @preferred_delimiters)
+          percent_literal_corrector.correct(corrector, node, literal_prefix)
+        end
       end
     end
   end

data/lib/rubocop/cop/mixin/percent_literal.rb

@@ -27,12 +27,6 @@ module RuboCop
       def type(node)
         node.loc.begin.source[0..-2]
       end
-
-      # A range containing only the contents of the percent literal (e.g. in
-      # %i{1 2 3} this will be the range covering '1 2 3' only)
-      def contents_range(node)
-        range_between(node.loc.begin.end_pos, node.loc.end.begin_pos)
-      end
     end
   end
 end

data/lib/rubocop/cop/mixin/preceding_following_alignment.rb

@@ -50,9 +50,7 @@ module RuboCop
       end
 
       def aligned_with_any_line?(line_ranges, range, indent = nil, &predicate)
-        line_ranges.any? do |line_nos|
-          aligned_with_line?(line_nos, range, indent, &predicate)
-        end
+        line_ranges.any? { |line_nos| aligned_with_line?(line_nos, range, indent, &predicate) }
       end
 
       def aligned_with_line?(line_nos, range, indent = nil)
@@ -87,7 +85,7 @@ module RuboCop
       end
 
       def aligned_words?(range, line)
-        line[range.column - 1, 2] =~ /\s\S/
+        /\s\S/.match?(line[range.column - 1, 2])
       end
 
       def aligned_char?(range, line)
@@ -103,15 +101,13 @@ module RuboCop
       end
 
       def aligned_with_assignment(token, line_range)
-        token_line_indent    = processed_source
-                               .line_indentation(token.line)
+        token_line_indent    = processed_source.line_indentation(token.line)
         assignment_lines     = relevant_assignment_lines(line_range)
         relevant_line_number = assignment_lines[1]
 
         return :none unless relevant_line_number
 
-        relevant_indent = processed_source
-                          .line_indentation(relevant_line_number)
+        relevant_indent = processed_source.line_indentation(relevant_line_number)
 
         return :none if relevant_indent < token_line_indent
 
@@ -144,8 +140,7 @@ module RuboCop
       # rubocop:disable Metrics/PerceivedComplexity, Metrics/MethodLength
       def relevant_assignment_lines(line_range)
         result                        = []
-        original_line_indent          = processed_source
-                                        .line_indentation(line_range.first)
+        original_line_indent          = processed_source.line_indentation(line_range.first)
         relevant_line_indent_at_level = true
 
         line_range.each do |line_number|
@@ -161,8 +156,7 @@ module RuboCop
                                    current_line_indent == original_line_indent
 
           unless blank_line
-            relevant_line_indent_at_level = \
-              current_line_indent == original_line_indent
+            relevant_line_indent_at_level = current_line_indent == original_line_indent
           end
         end
 

data/lib/rubocop/cop/mixin/preferred_delimiters.rb

@@ -15,18 +15,16 @@ module RuboCop
       end
 
       def delimiters
-        preferred_delimiters[type].split(//)
+        preferred_delimiters[type].chars
       end
 
       private
 
       def ensure_valid_preferred_delimiters
-        invalid = preferred_delimiters_config.keys -
-                  (PERCENT_LITERAL_TYPES + %w[default])
+        invalid = preferred_delimiters_config.keys - (PERCENT_LITERAL_TYPES + %w[default])
         return if invalid.empty?
 
-        raise ArgumentError,
-              "Invalid preferred delimiter config key: #{invalid.join(', ')}"
+        raise ArgumentError, "Invalid preferred delimiter config key: #{invalid.join(', ')}"
       end
 
       def preferred_delimiters
@@ -35,10 +33,9 @@ module RuboCop
             ensure_valid_preferred_delimiters
 
             if preferred_delimiters_config.key?('default')
-              Hash[PERCENT_LITERAL_TYPES.map do |type|
-                [type, preferred_delimiters_config[type] ||
-                  preferred_delimiters_config['default']]
-              end]
+              PERCENT_LITERAL_TYPES.map do |type|
+                [type, preferred_delimiters_config[type] || preferred_delimiters_config['default']]
+              end.to_h
             else
               preferred_delimiters_config
             end