rubocop 0.59.2 → 0.60.0

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks the indentation of hanging closing parentheses in
+      # This cop checks the indentation of hanging closing parentheses in
       # method calls, method definitions, and grouped expressions. A hanging
       # closing parenthesis means `)` preceded by a line break.
       #
@@ -116,9 +116,9 @@ module RuboCop
 
           add_offense(right_paren,
                       location: right_paren,
-                      message:  message(correct_column,
-                                        left_paren,
-                                        right_paren))
+                      message: message(correct_column,
+                                       left_paren,
+                                       right_paren))
         end
 
         def check_for_no_elements(node)
@@ -135,9 +135,9 @@ module RuboCop
           correct_column = candidates.first
           add_offense(right_paren,
                       location: right_paren,
-                      message:  message(correct_column,
-                                        left_paren,
-                                        right_paren))
+                      message: message(correct_column,
+                                       left_paren,
+                                       right_paren))
         end
 
         def expected_column(left_paren, elements)

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks the indentation of comments.
+      # This cop checks the indentation of comments.
       #
       # @example
       #   # bad

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

@@ -8,7 +8,7 @@ module RuboCop
       # @example EnforcedStyle: leading (default)
       #   # bad
       #   something.
-      #     mehod
+      #     method
       #
       #   # good
       #   something
@@ -21,7 +21,7 @@ module RuboCop
       #
       #   # good
       #   something.
-      #     mehod
+      #     method
       class DotPosition < Cop
         include ConfigurableEnforcedStyle
 

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks the alignment of else keywords. Normally they should
+      # This cop checks the alignment of else keywords. Normally they should
       # be aligned with an if/unless/while/until/begin/def keyword, but there
       # are special cases when they should follow the same rules as the
       # alignment of end.

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

@@ -24,12 +24,11 @@ module RuboCop
         include RangeHelp
 
         MSG = 'Add an empty line after magic comments.'.freeze
-        BLANK_LINE = /\A\s*\z/
 
         def investigate(source)
           return unless source.ast &&
                         (last_magic_comment = last_magic_comment(source))
-          return if source[last_magic_comment.loc.line] =~ BLANK_LINE
+          return if source[last_magic_comment.loc.line].strip.empty?
 
           offending_range =
             source_range(source.buffer, last_magic_comment.loc.line + 1, 0)

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

@@ -5,7 +5,7 @@ require 'set'
 module RuboCop
   module Cop
     module Layout
-      # This cops checks for two or more consecutive blank lines.
+      # This cop checks for two or more consecutive blank lines.
       #
       # @example
       #

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

@@ -32,21 +32,21 @@ module RuboCop
         def on_class(node)
           _name, superclass, _body = *node
 
-          @class_or_module_def_line = if superclass
-                                        superclass.first_line
-                                      else
-                                        node.source_range.first_line
-                                      end
+          @class_or_module_def = superclass || node.source_range
         end
 
         def on_module(node)
-          @class_or_module_def_line = node.source_range.first_line
+          @class_or_module_def = node.source_range
         end
 
         def on_sclass(node)
           self_node, _body = *node
 
-          @class_or_module_def_line = self_node.source_range.first_line
+          @class_or_module_def = self_node.source_range
+        end
+
+        def on_block(node)
+          @block_line = node.source_range.first_line
         end
 
         def on_send(node)
@@ -59,15 +59,13 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            send_line = node.first_line
-            next_line = processed_source[send_line]
             line = range_by_whole_lines(node.source_range)
 
-            unless previous_line_empty?(send_line)
+            unless previous_line_empty?(node.first_line)
               corrector.insert_before(line, "\n")
             end
 
-            unless next_line_empty?(next_line)
+            unless next_line_empty?(node.last_line)
               corrector.insert_after(line, "\n")
             end
           end
@@ -85,42 +83,44 @@ module RuboCop
           previous_line = previous_line_ignoring_comments(processed_source,
                                                           send_line)
 
-          block_start?(previous_line) ||
+          block_start?(send_line) ||
             class_def?(send_line) ||
             previous_line.blank?
         end
 
-        def next_line_empty?(next_line)
-          body_end?(next_line) || next_line.blank?
+        def next_line_empty?(last_send_line)
+          next_line = processed_source[last_send_line]
+
+          body_end?(last_send_line) || next_line.blank?
         end
 
         def empty_lines_around?(node)
-          send_line = node.first_line
-
-          next_line = processed_source[send_line]
-
-          previous_line_empty?(send_line) && next_line_empty?(next_line)
+          previous_line_empty?(node.first_line) &&
+            next_line_empty?(node.last_line)
         end
 
         def class_def?(line)
-          return false unless @class_or_module_def_line
+          return false unless @class_or_module_def
 
-          line == @class_or_module_def_line + 1
+          line == @class_or_module_def.first_line + 1
         end
 
         def block_start?(line)
-          line.match(/ (do|{)( \|.*?\|)?\s?$/)
+          return false unless @block_line
+
+          line == @block_line + 1
         end
 
         def body_end?(line)
-          line =~ /^\s*end\b/
+          return false unless @class_or_module_def
+
+          line == @class_or_module_def.last_line - 1
         end
 
         def message(node)
           send_line = node.first_line
-          previous_line = processed_source[send_line - 2]
 
-          if block_start?(previous_line) ||
+          if block_start?(send_line) ||
              class_def?(send_line)
             format(MSG_AFTER, modifier: node.loc.selector.source)
           else

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks if empty lines exist around the arguments
+      # This cop checks if empty lines exist around the arguments
       # of a method invocation.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks if empty lines exist around the bodies of begin-end
+      # This cop checks if empty lines exist around the bodies of begin-end
       # blocks.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks if empty lines around the bodies of blocks match
+      # This cop checks if empty lines around the bodies of blocks match
       # the configuration.
       #
       # @example EnforcedStyle: empty_lines

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks if empty lines around the bodies of classes match
+      # This cop checks if empty lines around the bodies of classes match
       # the configuration.
       #
       # @example EnforcedStyle: empty_lines

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks if empty lines exist around the bodies of `begin`
+      # This cop checks if empty lines exist around the bodies of `begin`
       # sections. This cop doesn't check empty lines at `begin` body
       # beginning/end and around method definition body.
       # `Style/EmptyLinesAroundBeginBody` or `Style/EmptyLinesAroundMethodBody`

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks if empty lines exist around the bodies of methods.
+      # This cop checks if empty lines exist around the bodies of methods.
       #
       # @example
       #

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks if empty lines around the bodies of modules match
+      # This cop checks if empty lines around the bodies of modules match
       # the configuration.
       #
       # @example EnforcedStyle: empty_lines

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

@@ -113,7 +113,7 @@ module RuboCop
           # assignment, we let rhs be the receiver of those method calls before
           # we check if it's an if/unless/while/until.
           return unless (rhs = first_part_of_call_chain(rhs))
-          return unless CONDITIONAL_NODES.include?(rhs.type)
+          return unless rhs.conditional?
           return if rhs.if_type? && rhs.ternary?
 
           check_asgn_alignment(node, rhs)

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

@@ -168,7 +168,7 @@ module RuboCop
           text = base_range(send_node, arg_node).source.strip
           base = if text !~ /\n/ && special_inner_call_indentation?(send_node)
                    "`#{text}`"
-                 elsif text.lines.reverse_each.first =~ /^\s*#/
+                 elsif comment_line?(text.lines.reverse_each.first)
                    'the start of the previous line (not counting the comment)'
                  else
                    'the start of the previous line'

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks the indentation of the first key in a hash literal
+      # This cop checks the indentation of the first key in a hash literal
       # where the opening brace and the first key are on separate lines. The
       # other keys' indentations are handled by the AlignHash cop.
       #

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks the indentation of the here document bodies. The bodies
+      # This cop checks the indentation of the here document bodies. The bodies
       # are indented one step.
       # In Ruby 2.3 or newer, squiggly heredocs (`<<~`) should be used. If you
       # use the older rubies, you should introduce some library to your project
@@ -88,7 +88,7 @@ module RuboCop
 
         def on_heredoc(node)
           body = heredoc_body(node)
-          return if body =~ /\A\s*\z/
+          return if body.strip.empty?
 
           body_indent_level = indent_level(body)
 

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks for inconsistent indentation.
+      # This cop checks for inconsistent indentation.
       #
       # The difference between `rails` and `normal` is that the `rails` style
       # prescribes that in classes and modules the `protected` and `private`

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks for indentation that doesn't use the specified number
+      # This cop checks for indentation that doesn't use the specified number
       # of spaces.
       #
       # See also the IndentationConsistency cop which is the companion to this

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Layout
-      # This cops checks for indentation of the first non-blank non-comment
+      # This cop checks for indentation of the first non-blank non-comment
       # line in a file.
       #
       # @example

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

@@ -4,7 +4,7 @@ module RuboCop
   module Cop
     module Layout
       # This cop checks that the closing brace in an array literal is either
-      # on the same line as the last array element, or a new line.
+      # on the same line as the last array element or on a new line.
       #
       # When using the `symmetrical` (default) style:
       #

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

@@ -61,7 +61,7 @@ module RuboCop
         private
 
         def relevant_node?(node)
-          return false if node.unary_operation?
+          return false if node.send_type? && node.unary_operation?
 
           !node.loc.dot # Don't check method calls with dot operator.
         end

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

@@ -29,6 +29,7 @@ module RuboCop
               '%<begin_loc_line>d, %<begin_loc_column>d.'.freeze
         ANCESTOR_TYPES = %i[kwbegin def defs class module].freeze
         RUBY_2_5_ANCESTOR_TYPES = (ANCESTOR_TYPES + [:block]).freeze
+        ANCESTOR_TYPES_WITH_ACCESS_MODIFIERS = %i[def defs].freeze
 
         def on_resbody(node)
           check(node) unless modifier?(node)
@@ -38,6 +39,18 @@ module RuboCop
           check(node)
         end
 
+        def autocorrect(node)
+          whitespace = whitespace_range(node)
+          # Some inline node is sitting before current node.
+          return nil unless whitespace.source.strip.empty?
+
+          alignment_node = alignment_node(node)
+          return false if alignment_node.nil?
+
+          new_column = alignment_node.loc.column
+          ->(corrector) { corrector.replace(whitespace, ' ' * new_column) }
+        end
+
         def investigate(processed_source)
           @modifier_locations =
             processed_source.tokens.each_with_object([]) do |token, locations|
@@ -47,50 +60,88 @@ module RuboCop
             end
         end
 
-        def autocorrect(node)
-          whitespace = whitespace_range(node)
-          return false unless whitespace.source.strip.empty?
+        private
 
-          new_column = ancestor_node(node).loc.end.column
-          ->(corrector) { corrector.replace(whitespace, ' ' * new_column) }
+        # Check alignment of node with rescue or ensure modifiers.
+
+        def check(node)
+          alignment_node = alignment_node(node)
+          return if alignment_node.nil?
+
+          alignment_loc = alignment_node.loc.expression
+          kw_loc        = node.loc.keyword
+
+          return if
+            alignment_loc.column == kw_loc.column ||
+            alignment_loc.line   == kw_loc.line
+
+          add_offense(
+            node,
+            location: kw_loc,
+            message: format_message(alignment_node, alignment_loc, kw_loc)
+          )
         end
 
-        private
+        def format_message(alignment_node, alignment_loc, kw_loc)
+          format(
+            MSG,
+            kw_loc: kw_loc.source,
+            kw_loc_line: kw_loc.line,
+            kw_loc_column: kw_loc.column,
+            beginning: alignment_source(alignment_node, alignment_loc),
+            begin_loc_line: alignment_loc.line,
+            begin_loc_column: alignment_loc.column
+          )
+        end
 
-        def check(node)
+        def alignment_source(node, starting_loc)
+          ending_loc =
+            case node.type
+            when :block, :kwbegin
+              node.loc.begin
+            when :def, :defs, :class, :module
+              node.loc.name
+            else
+              # It is a wrapper with access modifier.
+              node.child_nodes.first.loc.name
+            end
+
+          range_between(starting_loc.begin_pos, ending_loc.end_pos).source
+        end
+
+        # We will use ancestor or wrapper with access modifier.
+
+        def alignment_node(node)
           ancestor_node = ancestor_node(node)
-          alignment_loc = ancestor_node.loc.expression
-          kw_loc = node.loc.keyword
+          return nil if ancestor_node.nil?
 
-          return if alignment_loc.column == kw_loc.column
-          return if alignment_loc.line == kw_loc.line
+          access_modifier_node = access_modifier_node(ancestor_node)
+          return ancestor_node if access_modifier_node.nil?
 
-          add_offense(node,
-                      location: kw_loc,
-                      message: format_message(kw_loc,
-                                              alignment_loc,
-                                              ancestor_node))
+          access_modifier_node
         end
 
-        def format_message(kw_loc, alignment_loc, ancestor_node)
-          format(MSG,
-                 kw_loc: kw_loc.source,
-                 kw_loc_line: kw_loc.line,
-                 kw_loc_column: kw_loc.column,
-                 beginning: alignment_source(ancestor_node),
-                 begin_loc_line: alignment_loc.line,
-                 begin_loc_column: alignment_loc.column)
+        def ancestor_node(node)
+          ancestor_types =
+            if target_ruby_version >= 2.5
+              RUBY_2_5_ANCESTOR_TYPES
+            else
+              ANCESTOR_TYPES
+            end
+
+          node.each_ancestor(*ancestor_types).first
         end
 
-        def alignment_source(node)
-          ending = case node.type
-                   when :def, :defs, :class, :module
-                     node.loc.name
-                   when :block, :kwbegin
-                     node.loc.begin
-                   end
+        def access_modifier_node(node)
+          return nil unless
+            ANCESTOR_TYPES_WITH_ACCESS_MODIFIERS.include?(node.type)
+
+          access_modifier_node = node.ancestors.first
+          return nil unless
+            access_modifier_node.respond_to?(:access_modifier?) &&
+            access_modifier_node.access_modifier?
 
-          range_between(node.loc.expression.begin_pos, ending.end_pos).source
+          access_modifier_node
         end
 
         def modifier?(node)
@@ -100,21 +151,11 @@ module RuboCop
         end
 
         def whitespace_range(node)
-          begin_pos = node.loc.keyword.begin_pos
+          begin_pos      = node.loc.keyword.begin_pos
           current_column = node.loc.keyword.column
 
           range_between(begin_pos - current_column, begin_pos)
         end
-
-        def ancestor_node(node)
-          types = if target_ruby_version >= 2.5
-                    RUBY_2_5_ANCESTOR_TYPES
-                  else
-                    ANCESTOR_TYPES
-                  end
-
-          node.each_ancestor(*types).first
-        end
       end
     end
   end