rubocop 0.52.0 → 0.52.1

data/lib/rubocop/cop/generator/require_file_injector.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    class Generator
+      # A class that injects a require directive into the root RuboCop file.
+      # It looks for other directives that require files in the same (cop)
+      # namespace and injects the provided one in alpha
+      class RequireFileInjector
+        REQUIRE_PATH = /require_relative ['"](.+)['"]/
+
+        def initialize(source_path:, root_file_path:, output: $stdout)
+          @source_path = Pathname(source_path)
+          @root_file_path = Pathname(root_file_path)
+          @require_entries = File.readlines(root_file_path)
+          @output = output
+        end
+
+        def inject
+          return if require_exists? || !target_line
+
+          File.write(root_file_path, updated_directives)
+          require = injectable_require_directive.chomp
+          output.puts "[modify] #{root_file_path} - `#{require}` was injected."
+        end
+
+        private
+
+        attr_reader :require_entries, :root_file_path, :source_path, :output
+
+        def require_exists?
+          require_entries.any? do |entry|
+            entry == injectable_require_directive
+          end
+        end
+
+        def updated_directives
+          require_entries.insert(target_line,
+                                 injectable_require_directive).join
+        end
+
+        def target_line
+          @target_line ||= begin
+            in_the_same_department = false
+            inject_parts = require_path_fragments(injectable_require_directive)
+
+            require_entries.find.with_index do |entry, index|
+              current_entry_parts = require_path_fragments(entry)
+
+              if inject_parts[0..-2] == current_entry_parts[0..-2]
+                in_the_same_department = true
+
+                break index if inject_parts.last < current_entry_parts.last
+              elsif in_the_same_department
+                break index
+              end
+            end
+          end
+        end
+
+        def require_path_fragments(require_directove)
+          path = require_directove.match(REQUIRE_PATH)
+
+          path ? path.captures.first.split('/') : []
+        end
+
+        def injectable_require_directive
+          "require_relative '#{require_path}'\n"
+        end
+
+        def require_path
+          path = source_path.relative_path_from(root_file_path.dirname)
+          path.to_s.sub('.rb', '')
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/layout/access_modifier_indentation.rb

@@ -32,7 +32,7 @@ module RuboCop
       #     def smooth; end
       #   end
       class AccessModifierIndentation < Cop
-        include AutocorrectAlignment
+        include Alignment
         include ConfigurableEnforcedStyle
 
         MSG = '%<style>s access modifiers like `%<node>s`.'.freeze
@@ -58,6 +58,10 @@ module RuboCop
           check_body(node.body, node)
         end
 
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, @column_delta)
+        end
+
         private
 
         def check_body(body, node)

data/lib/rubocop/cop/layout/align_array.rb

@@ -21,7 +21,7 @@ module RuboCop
       #        'forrest',
       #        'run']
       class AlignArray < Cop
-        include AutocorrectAlignment
+        include Alignment
 
         MSG = 'Align the elements of an array literal if they span more ' \
               'than one line.'.freeze
@@ -29,6 +29,10 @@ module RuboCop
         def on_array(node)
           check_alignment(node.children)
         end
+
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, column_delta)
+        end
       end
     end
   end

data/lib/rubocop/cop/layout/align_hash.rb

@@ -116,7 +116,7 @@ module RuboCop
 
         def on_hash(node)
           return if ignored_node?(node)
-          return if node.empty? || node.single_line?
+          return if node.pairs.empty? || node.single_line?
 
           return unless alignment_for_hash_rockets.checkable_layout?(node) &&
                         alignment_for_colons.checkable_layout?(node)

data/lib/rubocop/cop/layout/align_parameters.rb

@@ -28,7 +28,7 @@ module RuboCop
       #   foo :bar,
       #       :baz
       class AlignParameters < Cop
-        include AutocorrectAlignment
+        include Alignment
 
         ALIGN_PARAMS_MSG = 'Align the parameters of a method %<type>s if ' \
           'they span more than one line.'.freeze
@@ -45,6 +45,10 @@ module RuboCop
         alias on_def  on_send
         alias on_defs on_send
 
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, column_delta)
+        end
+
         private
 
         def message(node)

data/lib/rubocop/cop/layout/case_indentation.rb

@@ -68,7 +68,7 @@ module RuboCop
       #     y / 3
       #   end
       class CaseIndentation < Cop
-        include AutocorrectAlignment
+        include Alignment
         include ConfigurableEnforcedStyle
 
         MSG = 'Indent `when` %<depth>s `%<base>s`.'.freeze

data/lib/rubocop/cop/layout/class_structure.rb

@@ -264,7 +264,7 @@ module RuboCop
         end
 
         def begin_pos_with_comment(node)
-          annotation_line = node.loc.line - 1
+          annotation_line = node.first_line - 1
           first_comment = nil
 
           comments_before_line(annotation_line).reverse_each do |comment|
@@ -278,7 +278,7 @@ module RuboCop
         end
 
         def start_line_position(node)
-          buffer.line_range(node.loc.line).begin_pos - 1
+          buffer.line_range(node.first_line).begin_pos - 1
         end
 
         def comments_before_line(line)

data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb

@@ -27,7 +27,7 @@ module RuboCop
       #     )
       #   end
       class ClosingParenthesisIndentation < Cop
-        include AutocorrectAlignment
+        include Alignment
 
         MSG_INDENT =
           'Indent `)` the same as the start of the line where `(` is.'.freeze
@@ -46,6 +46,10 @@ module RuboCop
         end
         alias on_defs on_def
 
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, @column_delta)
+        end
+
         private
 
         def check(node, elements)

data/lib/rubocop/cop/layout/comment_indentation.rb

@@ -33,7 +33,7 @@ module RuboCop
       #   end
       #
       class CommentIndentation < Cop
-        include AutocorrectAlignment
+        include Alignment
 
         MSG = 'Incorrect indentation detected (column %<column>d ' \
           'instead of %<correct_comment_indentation>d).'.freeze
@@ -42,6 +42,10 @@ module RuboCop
           processed_source.comments.each { |comment| check(comment) }
         end
 
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, @column_delta)
+        end
+
         private
 
         def check(comment)

data/lib/rubocop/cop/layout/else_alignment.rb

@@ -31,7 +31,7 @@ module RuboCop
       #   end
       class ElseAlignment < Cop
         include EndKeywordAlignment
-        include AutocorrectAlignment
+        include Alignment
         include CheckAssignment
 
         MSG = 'Align `%<else_range>s` with `%<base_range>s`.'.freeze
@@ -66,6 +66,10 @@ module RuboCop
           check_alignment(node.when_branches.last.loc.keyword, node.loc.else)
         end
 
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, column_delta)
+        end
+
         private
 
         def check_nested(node, base)

data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb

@@ -37,7 +37,7 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            send_line = node.loc.line
+            send_line = node.first_line
             previous_line = processed_source[send_line - 2]
             next_line = processed_source[send_line]
             line = range_by_whole_lines(node.source_range)
@@ -71,7 +71,7 @@ module RuboCop
         end
 
         def empty_lines_around?(node)
-          send_line = node.loc.line
+          send_line = node.first_line
           previous_line = previous_line_ignoring_comments(processed_source,
                                                           send_line)
           next_line = processed_source[send_line]
@@ -92,7 +92,7 @@ module RuboCop
         end
 
         def message(node)
-          previous_line = processed_source[node.loc.line - 2]
+          previous_line = processed_source[node.first_line - 2]
 
           if block_start?(previous_line) ||
              class_def?(previous_line)

data/lib/rubocop/cop/layout/empty_lines_around_arguments.rb

@@ -42,8 +42,7 @@ module RuboCop
         MSG = 'Empty line detected around arguments.'.freeze
 
         def on_send(node)
-          return if node.single_line?
-          return if empty_lines(node).empty?
+          return if node.single_line? || node.arguments.empty?
           extra_lines(node) { |range| add_offense(node, location: range) }
         end
 
@@ -56,21 +55,9 @@ module RuboCop
         private
 
         def empty_lines(node)
-          @empty_lines ||= begin
-            lines = source_lines(node).map.with_index(1).to_a
-            lines.select! { |code, _| code == '' }
-            lines.map { |_, line| line }
-          end
-        end
-
-        def source_lines(node)
-          source =
-            if node.arguments.last && node.arguments.last.block_type?
-              source_without_block(node, node.arguments.last)
-            else
-              node.source
-            end
-          source.lines.map { |line| line.delete("\n") }
+          lines = processed_lines(node).map.with_index(first_line(node)).to_a
+          lines.select! { |code, _| code.empty? }
+          lines.map { |_, line| line }
         end
 
         def extra_lines(node)
@@ -80,8 +67,19 @@ module RuboCop
           end
         end
 
-        def source_without_block(node, block_node)
-          node.source.split(block_node.source).first
+        def first_line(node)
+          node.receiver ? node.receiver.last_line : node.first_line
+        end
+
+        def last_line(node)
+          last_arg = node.arguments.last
+          last_arg.block_type? ? last_arg.first_line : node.last_line
+        end
+
+        def processed_lines(node)
+          start = first_line(node) - 1
+          stop = last_line(node) - 1
+          processed_source.lines[start..stop]
         end
       end
     end

data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb

@@ -31,6 +31,10 @@ module RuboCop
           check(node, nil)
         end
 
+        def autocorrect(node)
+          EmptyLineCorrector.correct(node)
+        end
+
         private
 
         def style

data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb

@@ -29,6 +29,10 @@ module RuboCop
         def on_block(node)
           check(node, node.body)
         end
+
+        def autocorrect(node)
+          EmptyLineCorrector.correct(node)
+        end
       end
     end
   end

data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb

@@ -58,6 +58,10 @@ module RuboCop
           _obj, body = *node
           check(node, body)
         end
+
+        def autocorrect(node)
+          EmptyLineCorrector.correct(node)
+        end
       end
     end
   end

data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb

@@ -73,6 +73,10 @@ module RuboCop
           check_body(body)
         end
 
+        def autocorrect(node)
+          EmptyLineCorrector.correct(node)
+        end
+
         private
 
         def check_body(node)

data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb

@@ -30,6 +30,10 @@ module RuboCop
         end
         alias on_defs on_def
 
+        def autocorrect(node)
+          EmptyLineCorrector.correct(node)
+        end
+
         private
 
         def style

data/lib/rubocop/cop/layout/empty_lines_around_module_body.rb

@@ -53,6 +53,10 @@ module RuboCop
           _name, body = *node
           check(node, body)
         end
+
+        def autocorrect(node)
+          EmptyLineCorrector.correct(node)
+        end
       end
     end
   end

data/lib/rubocop/cop/layout/first_array_element_line_break.rb

@@ -29,6 +29,10 @@ module RuboCop
           check_children_line_break(node, node.children)
         end
 
+        def autocorrect(node)
+          EmptyLineCorrector.insert_before(node)
+        end
+
         private
 
         def assignment_on_same_line?(node)

data/lib/rubocop/cop/layout/first_hash_element_line_break.rb

@@ -27,6 +27,10 @@ module RuboCop
           # If it doesn't, Style/FirstMethodArgumentLineBreak will handle it
           check_children_line_break(node, node.children) if node.loc.begin
         end
+
+        def autocorrect(node)
+          EmptyLineCorrector.insert_before(node)
+        end
       end
     end
   end

data/lib/rubocop/cop/layout/first_method_argument_line_break.rb

@@ -43,6 +43,10 @@ module RuboCop
 
           check_method_line_break(node, args)
         end
+
+        def autocorrect(node)
+          EmptyLineCorrector.insert_before(node)
+        end
       end
     end
   end

data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb

@@ -36,6 +36,10 @@ module RuboCop
           check_method_line_break(node, node.arguments)
         end
         alias on_defs on_def
+
+        def autocorrect(node)
+          EmptyLineCorrector.insert_before(node)
+        end
       end
     end
   end

data/lib/rubocop/cop/layout/first_parameter_indentation.rb

@@ -19,7 +19,7 @@ module RuboCop
       #     first_param,
       #   second_param)
       class FirstParameterIndentation < Cop
-        include AutocorrectAlignment
+        include Alignment
         include ConfigurableEnforcedStyle
 
         MSG = 'Indent the first parameter one step more than %<base>s.'.freeze
@@ -32,6 +32,10 @@ module RuboCop
           check_alignment([node.first_argument], indent)
         end
 
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, column_delta)
+        end
+
         private
 
         def message(arg_node)
@@ -54,7 +58,7 @@ module RuboCop
           if special_inner_call_indentation?(node)
             column_of(base_range(node, node.first_argument))
           else
-            previous_code_line(node.first_argument.loc.line) =~ /\S/
+            previous_code_line(node.first_argument.first_line) =~ /\S/
           end
         end