rubocop 0.52.0 → 0.52.1

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

@@ -10,6 +10,8 @@ module RuboCop
       MSG = 'Favor `%<inverse>s` over `%<current>s` for ' \
             'negative conditions.'.freeze
 
+      private
+
       def_node_matcher :single_negative?, '(send !(send _ :!) :!)'
       def_node_matcher :empty_condition?, '(begin)'
 
@@ -25,22 +27,6 @@ module RuboCop
 
         add_offense(node)
       end
-
-      def negative_conditional_corrector(node)
-        condition = negated_condition(node)
-
-        lambda do |corrector|
-          corrector.replace(node.loc.keyword, node.inverse_keyword)
-          corrector.replace(condition.source_range,
-                            condition.children.first.source)
-        end
-      end
-
-      def negated_condition(node)
-        condition = node.condition
-        condition = condition.children.first while condition.begin_type?
-        condition
-      end
     end
   end
 end

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

@@ -5,25 +5,25 @@ module RuboCop
     # Common functionality for Bundler/OrderedGems and
     # Gemspec/OrderedDependencies.
     module OrderedGemNode
-      def autocorrect(node)
-        previous = previous_declaration(node)
-
-        current_range = declaration_with_comment(node)
-        previous_range = declaration_with_comment(previous)
+      private
 
-        lambda do |corrector|
-          swap_range(corrector, current_range, previous_range)
+      def get_source_range(node, comments_as_separators)
+        unless comments_as_separators
+          first_comment = processed_source.ast_with_comments[node].first
+          return first_comment.loc.expression unless first_comment.nil?
         end
+        node.source_range
       end
 
-      private
-
       def case_insensitive_out_of_order?(string_a, string_b)
         string_a.downcase < string_b.downcase
       end
 
       def consecutive_lines(previous, current)
-        first_line = get_source_range(current).first_line
+        first_line = get_source_range(
+          current,
+          treat_comments_as_separators
+        ).first_line
         previous.source_range.last_line == first_line - 1
       end
 
@@ -40,27 +40,8 @@ module RuboCop
         declaration_node.first_argument.str_content
       end
 
-      def declaration_with_comment(node)
-        buffer = processed_source.buffer
-        begin_pos = get_source_range(node).begin_pos
-        end_line = buffer.line_for_position(node.loc.expression.end_pos)
-        end_pos = buffer.line_range(end_line).end_pos
-        Parser::Source::Range.new(buffer, begin_pos, end_pos)
-      end
-
-      def swap_range(corrector, range1, range2)
-        src1 = range1.source
-        src2 = range2.source
-        corrector.replace(range1, src2)
-        corrector.replace(range2, src1)
-      end
-
-      def get_source_range(node)
-        unless cop_config['TreatCommentsAsGroupSeparators']
-          first_comment = processed_source.ast_with_comments[node].first
-          return first_comment.loc.expression unless first_comment.nil?
-        end
-        node.source_range
+      def treat_comments_as_separators
+        cop_config['TreatCommentsAsGroupSeparators']
       end
     end
   end

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

@@ -4,31 +4,14 @@ module RuboCop
   module Cop
     # Common functionality for handling parentheses.
     module Parentheses
+      private
+
       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]/
       end
-
-      def autocorrect(node)
-        lambda do |corrector|
-          corrector.remove(node.loc.begin)
-          corrector.remove(node.loc.end)
-
-          if ternary_condition?(node) && next_char_is_question_mark?(node)
-            corrector.insert_after(node.loc.end, ' ')
-          end
-        end
-      end
-
-      def ternary_condition?(node)
-        node.parent && node.parent.if_type? && node.parent.ternary?
-      end
-
-      def next_char_is_question_mark?(node)
-        node.loc.last_column == node.parent.loc.question.column
-      end
     end
   end
 end

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

@@ -38,7 +38,7 @@ module RuboCop
         escape = words.any? { |w| needs_escaping?(w.children[0]) }
         char = char.upcase if escape
         delimiters = preferred_delimiters_for("%#{char}")
-        contents = autocorrect_words(words, escape, node.loc.line, delimiters)
+        contents = autocorrect_words(words, escape, node.first_line, delimiters)
 
         lambda do |corrector|
           corrector.replace(
@@ -51,9 +51,9 @@ module RuboCop
       def autocorrect_words(word_nodes, escape, base_line_number, delimiters)
         previous_node_line_number = base_line_number
         word_nodes.map do |node|
-          number_of_line_breaks = node.loc.line - previous_node_line_number
+          number_of_line_breaks = node.first_line - previous_node_line_number
           line_breaks = "\n" * number_of_line_breaks
-          previous_node_line_number = node.loc.line
+          previous_node_line_number = node.first_line
           content = node.children.first.to_s
           content = escape ? escape_string(content) : content
           delimiters.each do |delimiter|

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

@@ -5,6 +5,8 @@ module RuboCop
     # Common functionality for checking whether an AST node/token is aligned
     # with something on a preceding or following line
     module PrecedingFollowingAlignment
+      private
+
       def allow_for_alignment?
         cop_config['AllowForAlignment']
       end

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

@@ -11,6 +11,8 @@ module RuboCop
                               .map(&:pos)
       end
 
+      private
+
       def rescue_modifier?(node)
         node &&
           node.resbody_type? &&

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

@@ -8,6 +8,8 @@ module RuboCop
     module SafeAssignment
       extend NodePattern::Macros
 
+      private
+
       def_node_matcher :empty_condition?, '(begin)'
       def_node_matcher :safe_assignment?,
                        '(begin {equals_asgn? asgn_method_call?})'

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

@@ -14,9 +14,7 @@ module RuboCop
         end
       end
 
-      def autocorrect(token)
-        ->(corrector) { corrector.replace(token.pos, token.pos.source + ' ') }
-      end
+      private
 
       def each_missing_space(tokens)
         tokens.each_cons(2) do |t1, t2|

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

@@ -14,9 +14,7 @@ module RuboCop
         end
       end
 
-      def autocorrect(pos_before_punctuation)
-        ->(corrector) { corrector.remove(pos_before_punctuation) }
-      end
+      private
 
       def each_missing_space(tokens)
         tokens.each_cons(2) do |t1, t2|

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

@@ -4,6 +4,8 @@ module RuboCop
   module Cop
     # Common functionality for modifier cops.
     module StatementModifier
+      private
+
       def single_line_as_modifier?(node)
         return false if non_eligible_node?(node) ||
                         non_eligible_body?(node.body) ||
@@ -19,7 +21,7 @@ module RuboCop
 
       def non_eligible_body?(body)
         body.nil? ||
-          body.empty? ||
+          body.empty_source? ||
           body.begin_type? ||
           commented?(body.source_range)
       end
@@ -30,7 +32,7 @@ module RuboCop
 
       def modifier_fits_on_single_line?(node)
         modifier_length = length_in_modifier_form(node, node.condition,
-                                                  node.body.length)
+                                                  node.body.source_length)
 
         modifier_length <= max_line_length
       end

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

@@ -24,6 +24,8 @@ module RuboCop
         ignore_node(node)
       end
 
+      private
+
       def inside_interpolation?(node)
         # A :begin node inside a :dstr node is an interpolation.
         node.ancestors.drop_while { |a| !a.begin_type? }.any?(&:dstr_type?)

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

@@ -6,6 +6,8 @@ module RuboCop
     module StringLiteralsHelp
       include StringHelp
 
+      private
+
       def wrong_quotes?(node)
         src = node.source
         return false if src.start_with?('%', '?')
@@ -15,19 +17,6 @@ module RuboCop
           src !~ /" | \\[^'] | \#(@|\{)/x
         end
       end
-
-      def autocorrect(node)
-        return if node.dstr_type?
-
-        lambda do |corrector|
-          str = node.str_content
-          if style == :single_quotes
-            corrector.replace(node.source_range, to_string_literal(str))
-          else
-            corrector.replace(node.source_range, str.inspect)
-          end
-        end
-      end
     end
   end
 end

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

@@ -7,6 +7,8 @@ module RuboCop
       NO_SPACE_COMMAND = 'Do not use'.freeze
       SPACE_COMMAND = 'Use'.freeze
 
+      private
+
       def side_space_range(range:, side:)
         buffer = @processed_source.buffer
         src = buffer.source
@@ -50,7 +52,8 @@ module RuboCop
       end
 
       def tokens(node)
-        processed_source.tokens.select do |token|
+        @tokens ||= {}
+        @tokens[node.object_id] ||= processed_source.tokens.select do |token|
           token.end_pos <= node.source_range.end_pos &&
             token.begin_pos >= node.source_range.begin_pos
         end
@@ -69,16 +72,6 @@ module RuboCop
         space_offense(node, right_token, :left, message, NO_SPACE_COMMAND)
       end
 
-      def no_space_corrector(corrector, left_token, right_token)
-        if left_token.space_after?
-          range = side_space_range(range: left_token.pos, side: :right)
-          corrector.remove(range)
-        end
-        return unless right_token.space_before?
-        range = side_space_range(range: right_token.pos, side: :left)
-        corrector.remove(range)
-      end
-
       def space_offenses(node, # rubocop:disable Metrics/ParameterLists
                          left_token,
                          right_token,
@@ -92,16 +85,6 @@ module RuboCop
         space_offense(node, right_token, :none, message, SPACE_COMMAND)
       end
 
-      def space_corrector(corrector, left_token, right_token)
-        unless left_token.space_after?
-          corrector.insert_after(left_token.pos, ' ')
-        end
-        return if right_token.space_before?
-        corrector.insert_before(right_token.pos, ' ')
-      end
-
-      private
-
       def extra_space?(token, side)
         return false unless token
         if side == :left

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

@@ -9,16 +9,7 @@ module RuboCop
 
       MSG = '%<command>s comma after the last %<unit>s.'.freeze
 
-      def autocorrect(range)
-        return unless range
-
-        lambda do |corrector|
-          case range.source
-          when ',' then corrector.remove(range)
-          else          corrector.insert_after(range, ',')
-          end
-        end
-      end
+      private
 
       def style_parameter_name
         'EnforcedStyleForMultiline'

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

@@ -17,6 +17,8 @@ module RuboCop
           end
         end
 
+        private
+
         def check_argument(variable)
           return if variable.should_be_unused?
           return if variable.referenced?
@@ -25,21 +27,6 @@ module RuboCop
           add_offense(variable.declaration_node, location: :name,
                                                  message: message)
         end
-
-        def autocorrect(node)
-          return if %i[kwarg kwoptarg].include?(node.type)
-
-          if node.blockarg_type?
-            lambda do |corrector|
-              range = range_with_surrounding_space(range: node.source_range,
-                                                   side: :left)
-              range = range_with_surrounding_comma(range, :left)
-              corrector.remove(range)
-            end
-          else
-            ->(corrector) { corrector.insert_before(node.loc.name, '_') }
-          end
-        end
       end
     end
   end

data/lib/rubocop/cop/performance/case_when_splat.rb

@@ -51,7 +51,7 @@ module RuboCop
       #     baz
       #   end
       class CaseWhenSplat < Cop
-        include AutocorrectAlignment
+        include Alignment
 
         MSG = 'Place `when` conditions with a splat ' \
               'at the end of the `when` branches.'.freeze

data/lib/rubocop/cop/rails/action_filter.rb

@@ -36,7 +36,7 @@ module RuboCop
         extend TargetRailsVersion
         include ConfigurableEnforcedStyle
 
-        MSG = 'Prefer `%s` over `%s`.'.freeze
+        MSG = 'Prefer `%<prefer>s` over `%<current>s`.'.freeze
 
         FILTER_METHODS = %i[
           after_filter
@@ -96,7 +96,8 @@ module RuboCop
         end
 
         def message(node)
-          format(MSG, preferred_method(node.method_name), node.method_name)
+          format(MSG, prefer: preferred_method(node.method_name),
+                      current: node.method_name)
         end
 
         def bad_methods

data/lib/rubocop/cop/rails/active_support_aliases.rb

@@ -20,7 +20,7 @@ module RuboCop
       #   [1, 2, 'a'].prepend('b')
       #
       class ActiveSupportAliases < Cop
-        MSG = 'Use `%s` instead of `%s`.'.freeze
+        MSG = 'Use `%<prefer>s` instead of `%<current>s`.'.freeze
 
         ALIASES = {
           starts_with?: {
@@ -58,7 +58,8 @@ module RuboCop
         def register_offense(node, method_name)
           add_offense(
             node,
-            message: format(MSG, ALIASES[method_name][:original], method_name)
+            message: format(MSG, prefer: ALIASES[method_name][:original],
+                                 current: method_name)
           )
         end
       end

data/lib/rubocop/cop/rails/application_job.rb

@@ -28,6 +28,12 @@ module RuboCop
         # rubocop:disable Layout/ClassStructure
         include RuboCop::Cop::EnforceSuperclass
         # rubocop:enable Layout/ClassStructure
+
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.replace(node.source_range, self.class::SUPERCLASS)
+          end
+        end
       end
     end
   end

data/lib/rubocop/cop/rails/application_record.rb

@@ -28,6 +28,12 @@ module RuboCop
         # rubocop:disable Layout/ClassStructure
         include RuboCop::Cop::EnforceSuperclass
         # rubocop:enable Layout/ClassStructure
+
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.replace(node.source_range, self.class::SUPERCLASS)
+          end
+        end
       end
     end
   end