rubocop 1.10.0 → 1.14.0

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

@@ -84,10 +84,7 @@ module RuboCop
             # below the keyword
             check_line(style, line, message('after', keyword), &:empty?)
             # above the keyword
-            check_line(style,
-                       line - 2,
-                       message('before', keyword),
-                       &:empty?)
+            check_line(style, line - 2, message('before', keyword), &:empty?)
           end
         end
 
@@ -113,10 +110,7 @@ module RuboCop
         end
 
         def keyword_locations_in_rescue(node)
-          [
-            node.loc.else,
-            *node.resbody_branches.map { |body| body.loc.keyword }
-          ].compact
+          [node.loc.else, *node.resbody_branches.map { |body| body.loc.keyword }].compact
         end
 
         def keyword_locations_in_ensure(node)

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

@@ -168,8 +168,7 @@ module RuboCop
           return node.parent if node.case_type? && node.argument?
 
           assignment = node.ancestors.find(&:assignment_or_similar?)
-          if assignment && !line_break_before_keyword?(assignment.source_range,
-                                                       node)
+          if assignment && !line_break_before_keyword?(assignment.source_range, node)
             assignment
           else
             # Fall back to 'keyword' style if this node is not on the RHS of an

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

@@ -65,7 +65,7 @@ module RuboCop
 
         # If there is no LF on the last line, we don't care if there's no CR.
         def unimportant_missing_cr?(index, last_line, line)
-          style == :crlf && index == last_line - 1 && !/\n$/.match?(line)
+          style == :crlf && index == last_line - 1 && !line.end_with?("\n")
         end
 
         def offense_message(line)

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

@@ -11,12 +11,12 @@ module RuboCop
       #   name      = "RuboCop"
       #   # Some comment and an empty line
       #
-      #   website  += "/rubocop-hq/rubocop" unless cond
+      #   website  += "/rubocop/rubocop" unless cond
       #   puts        "rubocop"          if     debug
       #
       #   # bad for any configuration
       #   set_app("RuboCop")
-      #   website  = "https://github.com/rubocop-hq/rubocop"
+      #   website  = "https://github.com/rubocop/rubocop"
       #
       #   # good only if AllowBeforeTrailingComments is true
       #   object.method(arg)  # this is a comment
@@ -34,8 +34,7 @@ module RuboCop
         include RangeHelp
 
         MSG_UNNECESSARY = 'Unnecessary spacing detected.'
-        MSG_UNALIGNED_ASGN = '`=` is not aligned with the %<location>s ' \
-                             'assignment.'
+        MSG_UNALIGNED_ASGN = '`=` is not aligned with the %<location>s assignment.'
 
         def on_new_investigation
           return if processed_source.blank?
@@ -81,15 +80,12 @@ module RuboCop
         end
 
         def check_other(token1, token2, ast)
-          return false if allow_for_trailing_comments? &&
-                          token2.text.start_with?('#')
+          return false if allow_for_trailing_comments? && token2.text.start_with?('#')
 
           extra_space_range(token1, token2) do |range|
             next if ignored_range?(ast, range.begin_pos)
 
-            add_offense(range, message: MSG_UNNECESSARY) do |corrector|
-              corrector.remove(range)
-            end
+            add_offense(range, message: MSG_UNNECESSARY) { |corrector| corrector.remove(range) }
           end
         end
 

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

@@ -144,16 +144,17 @@ module RuboCop
       #     nested_first_param),
       #   second_param
       #
-      class FirstArgumentIndentation < Cop
+      class FirstArgumentIndentation < Base
         include Alignment
         include ConfigurableEnforcedStyle
         include RangeHelp
+        extend AutoCorrector
 
         MSG = 'Indent the first argument one step more than %<base>s.'
 
         def on_send(node)
           return if style != :consistent && enforce_first_argument_with_fixed_indentation?
-          return if !node.arguments? || node.operator_method?
+          return if !node.arguments? || bare_operator?(node)
 
           indent = base_indentation(node) + configured_indentation_width
 
@@ -161,11 +162,15 @@ module RuboCop
         end
         alias on_csend on_send
 
-        def autocorrect(node)
-          AlignmentCorrector.correct(processed_source, node, column_delta)
+        private
+
+        def autocorrect(corrector, node)
+          AlignmentCorrector.correct(corrector, processed_source, node, column_delta)
         end
 
-        private
+        def bare_operator?(node)
+          node.operator_method? && !node.dot?
+        end
 
         def message(arg_node)
           return 'Bad indentation of the first argument.' unless arg_node
@@ -206,6 +211,7 @@ module RuboCop
           node.source_range.begin_pos > parent.source_range.begin_pos
         end
 
+        # @!method eligible_method_call?(node)
         def_node_matcher :eligible_method_call?, <<~PATTERN
           (send _ !:[]= ...)
         PATTERN

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

@@ -79,10 +79,11 @@ module RuboCop
       #   and_now_for_something = [
       #                             :completely_different
       #                           ]
-      class FirstArrayElementIndentation < Cop
+      class FirstArrayElementIndentation < Base
         include Alignment
         include ConfigurableEnforcedStyle
         include MultilineElementIndentation
+        extend AutoCorrector
 
         MSG = 'Use %<configured_indentation_width>d spaces for indentation ' \
               'in an array, relative to %<base_description>s.'
@@ -98,12 +99,12 @@ module RuboCop
         end
         alias on_csend on_send
 
-        def autocorrect(node)
-          AlignmentCorrector.correct(processed_source, node, @column_delta)
-        end
-
         private
 
+        def autocorrect(corrector, node)
+          AlignmentCorrector.correct(corrector, processed_source, node, @column_delta)
+        end
+
         def brace_alignment_style
           :align_brackets
         end
@@ -119,8 +120,7 @@ module RuboCop
             check_first(first_elem, left_bracket, left_parenthesis, 0)
           end
 
-          check_right_bracket(array_node.loc.end, left_bracket,
-                              left_parenthesis)
+          check_right_bracket(array_node.loc.end, left_bracket, left_parenthesis)
         end
 
         def check_right_bracket(right_bracket, left_bracket, left_parenthesis)
@@ -132,7 +132,9 @@ module RuboCop
           return if @column_delta.zero?
 
           msg = msg(left_parenthesis)
-          add_offense(right_bracket, location: right_bracket, message: msg)
+          add_offense(right_bracket, message: msg) do |corrector|
+            autocorrect(corrector, right_bracket)
+          end
         end
 
         # Returns the description of what the correct indentation is based on.

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

@@ -21,8 +21,7 @@ module RuboCop
         include FirstElementLineBreak
         extend AutoCorrector
 
-        MSG = 'Add a line break before the first element of a ' \
-              'multi-line array.'
+        MSG = 'Add a line break before the first element of a multi-line array.'
 
         def on_array(node)
           return if !node.loc.begin && !assignment_on_same_line?(node)

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

@@ -77,10 +77,11 @@ module RuboCop
       #   and_now_for_something = {
       #                             completely: :different
       #                           }
-      class FirstHashElementIndentation < Cop
+      class FirstHashElementIndentation < Base
         include Alignment
         include ConfigurableEnforcedStyle
         include MultilineElementIndentation
+        extend AutoCorrector
 
         MSG = 'Use %<configured_indentation_width>d spaces for indentation ' \
               'in a hash, relative to %<base_description>s.'
@@ -96,12 +97,12 @@ module RuboCop
         end
         alias on_csend on_send
 
-        def autocorrect(node)
-          AlignmentCorrector.correct(processed_source, node, @column_delta)
-        end
-
         private
 
+        def autocorrect(corrector, node)
+          AlignmentCorrector.correct(corrector, processed_source, node, @column_delta)
+        end
+
         def brace_alignment_style
           :align_braces
         end
@@ -116,8 +117,7 @@ module RuboCop
             return if first_pair.first_line == left_brace.line
 
             if separator_style?(first_pair)
-              check_based_on_longest_key(hash_node, left_brace,
-                                         left_parenthesis)
+              check_based_on_longest_key(hash_node, left_brace, left_parenthesis)
             else
               check_first(first_pair, left_brace, left_parenthesis, 0)
             end
@@ -134,16 +134,10 @@ module RuboCop
           @column_delta = expected_column - right_brace.column
           return if @column_delta.zero?
 
-          msg = if style == :align_braces
-                  'Indent the right brace the same as the left brace.'
-                elsif style == :special_inside_parentheses && left_parenthesis
-                  'Indent the right brace the same as the first position ' \
-                  'after the preceding left parenthesis.'
-                else
-                  'Indent the right brace the same as the start of the line ' \
-                  'where the left brace is.'
-                end
-          add_offense(right_brace, location: right_brace, message: msg)
+          message = message_for_right_brace(left_parenthesis)
+          add_offense(right_brace, message: message) do |corrector|
+            autocorrect(corrector, right_brace)
+          end
         end
 
         def separator_style?(first_pair)
@@ -153,9 +147,7 @@ module RuboCop
         end
 
         def check_based_on_longest_key(hash_node, left_brace, left_parenthesis)
-          key_lengths = hash_node.keys.map do |key|
-            key.source_range.length
-          end
+          key_lengths = hash_node.keys.map { |key| key.source_range.length }
           check_first(hash_node.pairs.first, left_brace, left_parenthesis,
                       key_lengths.max - key_lengths.first)
         end
@@ -178,6 +170,18 @@ module RuboCop
             base_description: base_description
           )
         end
+
+        def message_for_right_brace(left_parenthesis)
+          if style == :align_braces
+            'Indent the right brace the same as the left brace.'
+          elsif style == :special_inside_parentheses && left_parenthesis
+            'Indent the right brace the same as the first position ' \
+            'after the preceding left parenthesis.'
+          else
+            'Indent the right brace the same as the start of the line ' \
+            'where the left brace is.'
+          end
+        end
       end
     end
   end

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

@@ -20,8 +20,7 @@ module RuboCop
         include FirstElementLineBreak
         extend AutoCorrector
 
-        MSG = 'Add a line break before the first element of a ' \
-              'multi-line hash.'
+        MSG = 'Add a line break before the first element of a multi-line hash.'
 
         def on_hash(node)
           # node.loc.begin tells us whether the hash opens with a {

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

@@ -24,8 +24,7 @@ module RuboCop
         include FirstElementLineBreak
         extend AutoCorrector
 
-        MSG = 'Add a line break before the first argument of a ' \
-              'multi-line method argument list.'
+        MSG = 'Add a line break before the first argument of a multi-line method argument list.'
 
         def on_send(node)
           args = node.arguments.dup

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

@@ -30,8 +30,7 @@ module RuboCop
         include FirstElementLineBreak
         extend AutoCorrector
 
-        MSG = 'Add a line break before the first parameter of a ' \
-              'multi-line method parameter list.'
+        MSG = 'Add a line break before the first parameter of a multi-line method parameter list.'
 
         def on_def(node)
           check_method_line_break(node, node.arguments)

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

@@ -41,10 +41,11 @@ module RuboCop
       #   second_param)
       #     123
       #   end
-      class FirstParameterIndentation < Cop
+      class FirstParameterIndentation < Base
         include Alignment
         include ConfigurableEnforcedStyle
         include MultilineElementIndentation
+        extend AutoCorrector
 
         MSG = 'Use %<configured_indentation_width>d spaces for indentation ' \
              'in method args, relative to %<base_description>s.'
@@ -57,12 +58,12 @@ module RuboCop
         end
         alias on_defs on_def
 
-        def autocorrect(node)
-          AlignmentCorrector.correct(processed_source, node, @column_delta)
-        end
-
         private
 
+        def autocorrect(corrector, node)
+          AlignmentCorrector.correct(corrector, processed_source, node, @column_delta)
+        end
+
         def brace_alignment_style
           :align_parentheses
         end

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

@@ -193,8 +193,7 @@ module RuboCop
 
           last_argument = node.last_argument
 
-          return unless last_argument.hash_type? &&
-                        ignore_hash_argument?(last_argument)
+          return unless last_argument.hash_type? && ignore_hash_argument?(last_argument)
 
           ignore_node(last_argument)
         end
@@ -282,13 +281,11 @@ module RuboCop
         end
 
         def alignment_for_hash_rockets
-          @alignment_for_hash_rockets ||=
-            new_alignment('EnforcedHashRocketStyle')
+          @alignment_for_hash_rockets ||= new_alignment('EnforcedHashRocketStyle')
         end
 
         def alignment_for_colons
-          @alignment_for_colons ||=
-            new_alignment('EnforcedColonStyle')
+          @alignment_for_colons ||= new_alignment('EnforcedColonStyle')
         end
 
         def correct_node(corrector, node, delta)

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

@@ -132,9 +132,7 @@ module RuboCop
         end
 
         def extract_heredoc_argument(node)
-          node.arguments.find do |arg_node|
-            extract_heredoc(arg_node)
-          end
+          node.arguments.find { |arg_node| extract_heredoc(arg_node) }
         end
 
         def extract_heredoc(node)
@@ -234,12 +232,7 @@ module RuboCop
         def remove_internal_trailing_comma(node, corrector)
           offset = internal_trailing_comma_offset_from_last_arg(node)
           last_arg_end_pos = node.children.last.source_range.end_pos
-          corrector.remove(
-            range_between(
-              last_arg_end_pos,
-              last_arg_end_pos + offset
-            )
-          )
+          corrector.remove(range_between(last_arg_end_pos, last_arg_end_pos + offset))
         end
 
         def internal_trailing_comma?(node)

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

@@ -81,10 +81,7 @@ module RuboCop
         end
 
         def width_message(indentation_width)
-          format(
-            WIDTH_MSG,
-            indentation_width: indentation_width
-          )
+          format(WIDTH_MSG, indentation_width: indentation_width)
         end
 
         def line_too_long?(node)
@@ -126,8 +123,7 @@ module RuboCop
           body = heredoc_body(node)
           body_indent_level = indent_level(body)
           correct_indent_level = base_indent_level(node) + indentation_width
-          body.gsub(/^[^\S\r\n]{#{body_indent_level}}/,
-                    ' ' * correct_indent_level)
+          body.gsub(/^[^\S\r\n]{#{body_indent_level}}/, ' ' * correct_indent_level)
         end
 
         def indented_end(node)

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

@@ -118,9 +118,10 @@ module RuboCop
       #       def bar
       #       end
       #   end
-      class IndentationConsistency < Cop
+      class IndentationConsistency < Base
         include Alignment
         include ConfigurableEnforcedStyle
+        extend AutoCorrector
 
         MSG = 'Inconsistent indentation detected.'
 
@@ -132,12 +133,12 @@ module RuboCop
           check(node)
         end
 
-        def autocorrect(node)
-          AlignmentCorrector.correct(processed_source, node, column_delta)
-        end
-
         private
 
+        def autocorrect(corrector, node)
+          AlignmentCorrector.correct(corrector, processed_source, node, column_delta)
+        end
+
         # Not all nodes define `bare_access_modifier?` (for example,
         # `RuboCop::AST::DefNode` does not), so we must check `send_type?` first
         # to avoid a NoMethodError.
@@ -161,8 +162,10 @@ module RuboCop
           # to the level of the module (see `AccessModifierIndentation` cop) we
           # return nil so that `check_alignment` will derive the correct
           # indentation from the first child that is not an access modifier.
-          module_indent = display_column(node.parent.source_range)
           access_modifier_indent = display_column(first_child.source_range)
+          return access_modifier_indent unless node.parent
+
+          module_indent = display_column(node.parent.source_range)
           access_modifier_indent if access_modifier_indent > module_indent
         end