rubocop 0.52.0 → 0.52.1

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

@@ -19,7 +19,7 @@ module RuboCop
       # This default style is called 'special_inside_parentheses'. Alternative
       # styles are 'consistent' and 'align_brackets'. Here are examples:
       #
-      # @example EnforcedStyle: special_inside_parentheses
+      # @example EnforcedStyle: special_inside_parentheses (default)
       #   # The `special_inside_parentheses` style enforces that the first
       #   # element in an array literal where the opening bracket and first
       #   # element are on seprate lines is indented one step (two spaces) more
@@ -80,7 +80,7 @@ module RuboCop
       #                             :completely_different
       #                           ]
       class IndentArray < Cop
-        include AutocorrectAlignment
+        include Alignment
         include ConfigurableEnforcedStyle
         include ArrayHashIndentation
 
@@ -97,6 +97,10 @@ module RuboCop
           end
         end
 
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, @column_delta)
+        end
+
         private
 
         def brace_alignment_style

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

@@ -23,7 +23,7 @@ module RuboCop
       # other cops such as `IndentationConsistency` and `EndAlignment`.
       class IndentAssignment < Cop
         include CheckAssignment
-        include AutocorrectAlignment
+        include Alignment
 
         MSG = 'Indent the first line of the right-hand-side of a ' \
               'multi-line assignment.'.freeze
@@ -31,11 +31,15 @@ module RuboCop
         def check_assignment(node, rhs)
           return unless rhs
           return unless node.loc.operator
-          return if node.loc.operator.line == rhs.loc.line
+          return if node.loc.operator.line == rhs.first_line
 
           base = display_column(node.source_range)
           check_alignment([rhs], base + configured_indentation_width)
         end
+
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, column_delta)
+        end
       end
     end
   end

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

@@ -78,7 +78,7 @@ module RuboCop
       #                             completely: :different
       #                           }
       class IndentHash < Cop
-        include AutocorrectAlignment
+        include Alignment
         include ConfigurableEnforcedStyle
         include ArrayHashIndentation
 
@@ -95,6 +95,10 @@ module RuboCop
           end
         end
 
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, @column_delta)
+        end
+
         private
 
         def brace_alignment_style

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

@@ -14,7 +14,7 @@ module RuboCop
       #     end
       #   end
       class IndentationConsistency < Cop
-        include AutocorrectAlignment
+        include Alignment
         include ConfigurableEnforcedStyle
 
         MSG = 'Inconsistent indentation detected.'.freeze
@@ -27,6 +27,10 @@ module RuboCop
           check(node)
         end
 
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, column_delta)
+        end
+
         private
 
         def check(node)

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

@@ -44,7 +44,7 @@ module RuboCop
       #   end
       class IndentationWidth < Cop
         include EndKeywordAlignment
-        include AutocorrectAlignment
+        include Alignment
         include CheckAssignment
         include IgnoredPattern
 
@@ -141,6 +141,10 @@ module RuboCop
           check_if(node, node.body, node.else_branch, base.loc)
         end
 
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, @column_delta)
+        end
+
         private
 
         def check_members(base, members)

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

@@ -108,6 +108,10 @@ module RuboCop
         def on_array(node)
           check_brace_layout(node)
         end
+
+        def autocorrect(node)
+          MultilineLiteralBraceCorrector.correct(processed_source, node)
+        end
       end
     end
   end

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

@@ -44,7 +44,7 @@ module RuboCop
         def check_assignment(node, rhs)
           return unless rhs
           return unless supported_types.include?(rhs.type)
-          return if rhs.loc.first_line == rhs.loc.last_line
+          return if rhs.first_line == rhs.last_line
 
           case style
           when :new_line
@@ -55,13 +55,13 @@ module RuboCop
         end
 
         def check_new_line_offense(node, rhs)
-          return unless node.loc.operator.line == rhs.loc.line
+          return unless node.loc.operator.line == rhs.first_line
 
           add_offense(node, message: NEW_LINE_OFFENSE)
         end
 
         def check_same_line_offense(node, rhs)
-          return unless node.loc.operator.line != rhs.loc.line
+          return unless node.loc.operator.line != rhs.first_line
 
           add_offense(node, message: SAME_LINE_OFFENSE)
         end

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

@@ -48,7 +48,7 @@ module RuboCop
             add_offense_for_expression(node, node.arguments, ARG_MSG)
           end
 
-          return unless node.body && node.loc.begin.line == node.body.loc.line
+          return unless node.body && node.loc.begin.line == node.body.first_line
 
           add_offense_for_expression(node, node.body, MSG)
         end
@@ -64,7 +64,7 @@ module RuboCop
 
             expr_before_body ||= node.loc.begin
 
-            if expr_before_body.line == node.body.loc.line
+            if expr_before_body.line == node.body.first_line
               autocorrect_body(corrector, node, node.body)
             end
           end

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

@@ -112,6 +112,10 @@ module RuboCop
         def on_hash(node)
           check_brace_layout(node)
         end
+
+        def autocorrect(node)
+          MultilineLiteralBraceCorrector.correct(processed_source, node)
+        end
       end
     end
   end

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

@@ -76,6 +76,10 @@ module RuboCop
           check_brace_layout(node)
         end
 
+        def autocorrect(node)
+          MultilineLiteralBraceCorrector.correct(processed_source, node)
+        end
+
         private
 
         def children(node)

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

@@ -48,7 +48,7 @@ module RuboCop
       #                  .c
       class MultilineMethodCallIndentation < Cop
         include ConfigurableEnforcedStyle
-        include AutocorrectAlignment
+        include Alignment
         include MultilineExpressionIndentation
 
         def validate_config
@@ -61,6 +61,10 @@ module RuboCop
                 '`EnforcedStyle` is `indented`.'
         end
 
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, @column_delta)
+        end
+
         private
 
         def relevant_node?(send_node)
@@ -191,7 +195,7 @@ module RuboCop
           node = node.parent
           node = node.parent until node.loc.dot
 
-          return if node.loc.dot.line != node.loc.line
+          return if node.loc.dot.line != node.first_line
           node
         end
 

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

@@ -80,6 +80,10 @@ module RuboCop
           check_brace_layout(node.arguments)
         end
         alias on_defs on_def
+
+        def autocorrect(node)
+          MultilineLiteralBraceCorrector.correct(processed_source, node)
+        end
       end
     end
   end

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

@@ -20,7 +20,7 @@ module RuboCop
       #   end
       class MultilineOperationIndentation < Cop
         include ConfigurableEnforcedStyle
-        include AutocorrectAlignment
+        include Alignment
         include MultilineExpressionIndentation
 
         def on_and(node)
@@ -40,6 +40,10 @@ module RuboCop
                                 '`EnforcedStyle` is `indented`.'
         end
 
+        def autocorrect(node)
+          AlignmentCorrector.correct(processed_source, node, @column_delta)
+        end
+
         private
 
         def relevant_node?(node)
@@ -54,7 +58,7 @@ module RuboCop
 
         def offending_range(node, lhs, rhs, given_style)
           return false unless begins_its_line?(rhs)
-          return false if lhs.loc.line == rhs.line # Needed for unary op.
+          return false if lhs.first_line == rhs.line # Needed for unary op.
           return false if not_for_this_cop?(node)
 
           correct_column = if should_align?(node, rhs, given_style)

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

@@ -86,7 +86,9 @@ module RuboCop
         end
 
         def ancestor_node(node)
-          node.each_ancestor(:kwbegin, :def, :defs, :class, :module).first
+          types = %i[kwbegin def defs class module]
+          types << :block if target_ruby_version >= 2.5
+          node.each_ancestor(*types).first
         end
       end
     end

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

@@ -17,6 +17,10 @@ module RuboCop
       class SpaceAfterComma < Cop
         include SpaceAfterPunctuation
 
+        def autocorrect(comma)
+          PunctuationCorrector.add_space(comma)
+        end
+
         def space_style_before_rcurly
           cfg = config.for_cop('Layout/SpaceInsideHashLiteralBraces')
           cfg['EnforcedStyle'] || 'space'

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

@@ -14,6 +14,10 @@ module RuboCop
       class SpaceAfterSemicolon < Cop
         include SpaceAfterPunctuation
 
+        def autocorrect(semicolon)
+          PunctuationCorrector.add_space(semicolon)
+        end
+
         def space_style_before_rcurly
           cfg = config.for_cop('Layout/SpaceInsideBlockBraces')
           cfg['EnforcedStyle'] || 'space'

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

@@ -18,6 +18,10 @@ module RuboCop
       class SpaceBeforeComma < Cop
         include SpaceBeforePunctuation
 
+        def autocorrect(space)
+          PunctuationCorrector.remove_space(space)
+        end
+
         def kind(token)
           'comma' if token.comma?
         end

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

@@ -14,6 +14,10 @@ module RuboCop
       class SpaceBeforeSemicolon < Cop
         include SpaceBeforePunctuation
 
+        def autocorrect(space)
+          PunctuationCorrector.remove_space(space)
+        end
+
         def kind(token)
           'semicolon' if token.semicolon?
         end

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

@@ -63,9 +63,10 @@ module RuboCop
             if empty_brackets?(left, right)
               empty_corrections(corrector, left, right)
             elsif style == :no_space
-              no_space_corrector(corrector, left, right)
+              SpaceCorrector.remove_space(processed_source, corrector,
+                                          left, right)
             elsif style == :space
-              space_corrector(corrector, left, right)
+              SpaceCorrector.add_space(processed_source, corrector, left, right)
             else
               compact_corrections(corrector, node, left, right)
             end

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

@@ -39,7 +39,7 @@ module RuboCop
           return if node.multiline?
           return unless left_ref_bracket(node)
           left_token = left_ref_bracket(node)
-          right_token = right_ref_bracket(node, left_token)
+          right_token = closing_bracket(node, left_token)
 
           if style == :no_space
             no_space_offenses(node, left_token, right_token, MSG)
@@ -53,9 +53,10 @@ module RuboCop
             left, right = reference_brackets(node)
 
             if style == :no_space
-              no_space_corrector(corrector, left, right)
+              SpaceCorrector.remove_space(processed_source, corrector,
+                                          left, right)
             else
-              space_corrector(corrector, left, right)
+              SpaceCorrector.add_space(processed_source, corrector, left, right)
             end
           end
         end
@@ -64,16 +65,24 @@ module RuboCop
 
         def reference_brackets(node)
           left = left_ref_bracket(node)
-          [left, right_ref_bracket(node, left)]
+          [left, closing_bracket(node, left)]
         end
 
         def left_ref_bracket(node)
           tokens(node).reverse.find(&:left_ref_bracket?)
         end
 
-        def right_ref_bracket(node, token)
-          i = tokens(node).index(token)
-          tokens(node).slice(i..-1).find(&:right_bracket?)
+        def closing_bracket(node, opening_bracket)
+          i = tokens(node).index(opening_bracket)
+          inner_left_brackets_needing_closure = 0
+
+          tokens(node)[i..-1].each do |token|
+            inner_left_brackets_needing_closure += 1 if token.left_bracket?
+            inner_left_brackets_needing_closure -= 1 if token.right_bracket?
+            if inner_left_brackets_needing_closure.zero? && token.right_bracket?
+              return token
+            end
+          end
         end
       end
     end

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

@@ -7,7 +7,7 @@ module RuboCop
     module Layout
       # This cop checks for tabs inside the source code.
       class Tab < Cop
-        include AutocorrectAlignment
+        include Alignment
 
         MSG = 'Tab detected.'.freeze
 

data/lib/rubocop/cop/lint/block_alignment.rb

@@ -124,7 +124,7 @@ module RuboCop
         end
 
         def disqualified_parent?(parent, node)
-          parent && parent.loc && parent.loc.line != node.loc.line &&
+          parent && parent.loc && parent.first_line != node.first_line &&
             !parent.masgn_type?
         end
 

data/lib/rubocop/cop/lint/def_end_alignment.rb

@@ -62,9 +62,9 @@ module RuboCop
 
         def autocorrect(node)
           if style == :start_of_line && node.parent && node.parent.send_type?
-            align(node, node.parent)
+            AlignmentCorrector.align_end(processed_source, node, node.parent)
           else
-            align(node, node)
+            AlignmentCorrector.align_end(processed_source, node, node)
           end
         end
       end

data/lib/rubocop/cop/lint/end_alignment.rb

@@ -82,7 +82,9 @@ module RuboCop
         end
 
         def autocorrect(node)
-          align(node, alignment_node(node))
+          AlignmentCorrector.align_end(processed_source,
+                                       node,
+                                       alignment_node(node))
         end
 
         private

data/lib/rubocop/cop/lint/implicit_string_concatenation.rb

@@ -49,7 +49,7 @@ module RuboCop
           node.children.each_cons(2) do |child1, child2|
             # `'abc' 'def'` -> (dstr (str "abc") (str "def"))
             next unless string_literal?(child1) && string_literal?(child2)
-            next unless child1.loc.last_line == child2.loc.line
+            next unless child1.last_line == child2.first_line
 
             # Make sure we don't flag a string literal which simply has
             # embedded newlines

data/lib/rubocop/cop/lint/unused_block_argument.rb

@@ -39,6 +39,10 @@ module RuboCop
       class UnusedBlockArgument < Cop
         include UnusedArgument
 
+        def autocorrect(node)
+          UnusedArgCorrector.correct(processed_source, node)
+        end
+
         private
 
         def check_argument(variable)