rubocop 1.43.0 → 1.50.2

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

@@ -6,17 +6,12 @@ module RuboCop
       # Checks for a line break before the first element in a
       # multi-line hash.
       #
-      # @example AllowMultilineFinalElement: false (default)
+      # @example
       #
       #     # bad
       #     { a: 1,
       #       b: 2}
       #
-      #     # bad
-      #     { a: 1, b: {
-      #       c: 3
-      #     }}
-      #
       #     # good
       #     {
       #       a: 1,
@@ -28,11 +23,14 @@ module RuboCop
       #       c: 3
       #     }}
       #
-      # @example AllowMultilineFinalElement: true
+      # @example AllowMultilineFinalElement: false (default)
       #
       #     # bad
-      #     { a: 1,
-      #       b: 2}
+      #     { a: 1, b: {
+      #       c: 3
+      #     }}
+      #
+      # @example AllowMultilineFinalElement: true
       #
       #     # bad
       #     { a: 1,
@@ -45,16 +43,6 @@ module RuboCop
       #       c: 3
       #     }}
       #
-      #     # good
-      #     {
-      #       a: 1,
-      #       b: 2 }
-      #
-      #     # good
-      #     {
-      #       a: 1, b: {
-      #       c: 3
-      #     }}
       class FirstHashElementLineBreak < Base
         include FirstElementLineBreak
         extend AutoCorrector

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

@@ -6,73 +6,63 @@ module RuboCop
       # Checks for a line break before the first argument in a
       # multi-line method call.
       #
-      # @example AllowMultilineFinalElement: false (default)
-      #
-      #     # bad
-      #     method(foo, bar,
-      #       baz)
-      #
-      #     # bad
-      #     method(foo, bar, {
-      #       baz: "a",
-      #       qux: "b",
-      #     })
+      # @example
       #
-      #     # good
-      #     method(
-      #       foo, bar,
-      #       baz)
+      #   # bad
+      #   method(foo, bar,
+      #     baz)
       #
-      #     # good
-      #     method(
-      #       foo, bar, {
-      #       baz: "a",
-      #       qux: "b",
-      #     })
+      #   # good
+      #   method(
+      #     foo, bar,
+      #     baz)
       #
       #     # ignored
       #     method foo, bar,
       #       baz
       #
-      # @example AllowMultilineFinalElement: true
+      # @example AllowMultilineFinalElement: false (default)
+      #
+      #   # bad
+      #   method(foo, bar, {
+      #     baz: "a",
+      #     qux: "b",
+      #   })
       #
-      #     # bad
-      #     method(foo, bar,
-      #       baz)
+      #   # good
+      #   method(
+      #     foo, bar, {
+      #     baz: "a",
+      #     qux: "b",
+      #   })
       #
-      #     # bad
-      #     method(foo,
-      #       bar,
-      #       {
-      #         baz: "a",
-      #         qux: "b",
-      #       }
-      #     )
+      # @example AllowMultilineFinalElement: true
       #
-      #     # good
-      #     method(foo, bar, {
+      #   # bad
+      #   method(foo,
+      #     bar,
+      #     {
       #       baz: "a",
       #       qux: "b",
-      #     })
+      #     }
+      #   )
       #
-      #     # good
-      #     method(
-      #       foo, bar,
-      #       baz)
+      #   # good
+      #   method(foo, bar, {
+      #     baz: "a",
+      #     qux: "b",
+      #   })
       #
-      #     # good
-      #     method(
-      #       foo,
-      #       bar,
-      #       {
-      #         baz: "a",
-      #         qux: "b",
-      #       }
-      #     )
+      #   # good
+      #   method(
+      #     foo,
+      #     bar,
+      #     {
+      #       baz: "a",
+      #       qux: "b",
+      #     }
+      #   )
       #
-      #     # ignored
-      #     method foo, bar,
-      #       baz
       class FirstMethodArgumentLineBreak < Base
         include FirstElementLineBreak
         extend AutoCorrector

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

@@ -6,69 +6,52 @@ module RuboCop
       # Checks for a line break before the first parameter in a
       # multi-line method parameter definition.
       #
-      # @example AllowMultilineFinalElement: false (default)
-      #
-      #     # bad
-      #     def method(foo, bar,
-      #         baz)
-      #       do_something
-      #     end
-      #
-      #     # bad
-      #     def method(foo, bar, baz = {
-      #       :a => "b",
-      #     })
-      #       do_something
-      #     end
+      # @example
       #
-      #     # good
-      #     def method(
-      #         foo, bar,
-      #         baz)
-      #       do_something
-      #     end
+      #   # bad
+      #   def method(foo, bar,
+      #       baz)
+      #     do_something
+      #   end
       #
-      #     # good
-      #     def method(
-      #       foo, bar, baz = {
-      #       :a => "b",
-      #     })
-      #       do_something
-      #     end
+      #   # good
+      #   def method(
+      #       foo, bar,
+      #       baz)
+      #     do_something
+      #   end
       #
-      #     # ignored
-      #     def method foo,
-      #         bar
-      #       do_something
-      #     end
+      #   # ignored
+      #   def method foo,
+      #       bar
+      #     do_something
+      #   end
       #
-      # @example AllowMultilineFinalElement: true
+      # @example AllowMultilineFinalElement: false (default)
       #
-      #     # bad
-      #     def method(foo, bar,
-      #         baz)
-      #       do_something
-      #     end
+      #   # bad
+      #   def method(foo, bar, baz = {
+      #     :a => "b",
+      #   })
+      #     do_something
+      #   end
       #
-      #     # good
-      #     def method(foo, bar, baz = {
-      #       :a => "b",
-      #     })
-      #       do_something
-      #     end
+      #   # good
+      #   def method(
+      #     foo, bar, baz = {
+      #     :a => "b",
+      #   })
+      #     do_something
+      #   end
       #
-      #     # good
-      #     def method(
-      #         foo, bar,
-      #         baz)
-      #       do_something
-      #     end
+      # @example AllowMultilineFinalElement: true
       #
-      #     # ignored
-      #     def method foo,
-      #         bar
-      #       do_something
-      #     end
+      #   # good
+      #   def method(foo, bar, baz = {
+      #     :a => "b",
+      #   })
+      #     do_something
+      #   end
       #
       class FirstMethodParameterLineBreak < Base
         include FirstElementLineBreak

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

@@ -67,8 +67,7 @@ module RuboCop
 
           outermost_send = outermost_send_on_same_line(heredoc_arg)
           return unless outermost_send
-          return unless outermost_send.loc.end
-          return unless heredoc_arg.first_line != outermost_send.loc.end.line
+          return if end_keyword_before_closing_parenthesis?(node)
           return if subsequent_closing_parentheses_in_same_line?(outermost_send)
           return if exist_argument_between_heredoc_end_and_closing_parentheses?(node)
 
@@ -160,6 +159,12 @@ module RuboCop
 
         # Closing parenthesis helpers.
 
+        def end_keyword_before_closing_parenthesis?(parenthesized_send_node)
+          parenthesized_send_node.ancestors.any? do |ancestor|
+            ancestor.loc.respond_to?(:end) && ancestor.loc.end&.source == 'end'
+          end
+        end
+
         def subsequent_closing_parentheses_in_same_line?(outermost_send)
           last_arg_of_outer_send = outermost_send.last_argument
           return false unless last_arg_of_outer_send&.loc.respond_to?(:end) &&
@@ -215,6 +220,7 @@ module RuboCop
         end
 
         def exist_argument_between_heredoc_end_and_closing_parentheses?(node)
+          return true unless node.loc.end
           return false unless (heredoc_end = find_most_bottom_of_heredoc_end(node.arguments))
 
           heredoc_end < node.loc.end.begin_pos &&

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

@@ -22,6 +22,7 @@ module RuboCop
       #   RUBY
       #
       class HeredocIndentation < Base
+        include Alignment
         include Heredoc
         extend AutoCorrector
 
@@ -37,7 +38,7 @@ module RuboCop
           heredoc_indent_type = heredoc_indent_type(node)
 
           if heredoc_indent_type == '~'
-            expected_indent_level = base_indent_level(node) + indentation_width
+            expected_indent_level = base_indent_level(node) + configured_indentation_width
             return if expected_indent_level == body_indent_level
           else
             return unless body_indent_level.zero?
@@ -66,9 +67,9 @@ module RuboCop
           current_indent_type = "<<#{heredoc_indent_type}"
 
           if current_indent_type == '<<~'
-            width_message(indentation_width)
+            width_message(configured_indentation_width)
           else
-            type_message(indentation_width, current_indent_type)
+            type_message(configured_indentation_width, current_indent_type)
           end
         end
 
@@ -89,7 +90,7 @@ module RuboCop
 
           body = heredoc_body(node)
 
-          expected_indent = base_indent_level(node) + indentation_width
+          expected_indent = base_indent_level(node) + configured_indentation_width
           actual_indent = indent_level(body)
           increase_indent_level = expected_indent - actual_indent
 
@@ -114,7 +115,7 @@ module RuboCop
         end
 
         def adjust_minus(corrector, node)
-          heredoc_beginning = node.loc.expression.source
+          heredoc_beginning = node.source
           corrected = heredoc_beginning.sub(/<<-?/, '<<~')
           corrector.replace(node, corrected)
         end
@@ -122,7 +123,7 @@ module RuboCop
         def indented_body(node)
           body = heredoc_body(node)
           body_indent_level = indent_level(body)
-          correct_indent_level = base_indent_level(node) + indentation_width
+          correct_indent_level = base_indent_level(node) + configured_indentation_width
           body.gsub(/^[^\S\r\n]{#{body_indent_level}}/, ' ' * correct_indent_level)
         end
 
@@ -138,7 +139,7 @@ module RuboCop
         end
 
         def base_indent_level(node)
-          base_line_num = node.loc.expression.line
+          base_line_num = node.source_range.line
           base_line = processed_source.lines[base_line_num - 1]
           indent_level(base_line)
         end
@@ -148,10 +149,6 @@ module RuboCop
           node.source[/^<<([~-])/, 1]
         end
 
-        def indentation_width
-          @config.for_cop('Layout/IndentationWidth')['Width'] || 2
-        end
-
         def heredoc_body(node)
           node.loc.heredoc_body.source
         end

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

@@ -34,7 +34,7 @@ module RuboCop
         private
 
         def first_token
-          processed_source.find_token { |t| !t.text.start_with?('#') }
+          processed_source.tokens.find { |t| !t.text.start_with?('#') }
         end
 
         def space_before(token)

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

@@ -63,7 +63,7 @@ module RuboCop
             next if gemfile_ruby_comment?(comment)
 
             add_offense(comment) do |corrector|
-              expr = comment.loc.expression
+              expr = comment.source_range
 
               corrector.insert_after(hash_mark(expr), ' ')
             end

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

@@ -51,12 +51,11 @@ module RuboCop
         private_constant :LINE_1_ENDING, :LINE_2_BEGINNING,
                          :LEADING_STYLE_OFFENSE, :TRAILING_STYLE_OFFENSE
 
-        # rubocop:disable Metrics/AbcSize
         def on_dstr(node)
           # Quick check if we possibly have line continuations.
           return unless node.source.include?('\\')
 
-          end_of_first_line = node.loc.expression.begin_pos - node.loc.expression.column
+          end_of_first_line = node.source_range.begin_pos - node.source_range.column
 
           raw_lines(node).each_cons(2) do |raw_line_one, raw_line_two|
             end_of_first_line += raw_line_one.length
@@ -70,7 +69,6 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         private
 

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

@@ -87,22 +87,26 @@ module RuboCop
           corrector.replace(range, correction)
         end
 
-        def string_literal_ranges(ast)
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        def ignored_literal_ranges(ast)
           # which lines start inside a string literal?
           return [] if ast.nil?
 
-          ranges = Set.new
-          ast.each_node(:str, :dstr) do |str|
-            loc = str.location
+          ast.each_node(:str, :dstr, :array).with_object(Set.new) do |literal, ranges|
+            loc = literal.location
 
-            if str.heredoc?
+            if literal.array_type?
+              next unless literal.percent_literal?
+
+              ranges << loc.expression
+            elsif literal.heredoc?
               ranges << loc.heredoc_body
             elsif loc.respond_to?(:begin) && loc.begin
               ranges << loc.expression
             end
           end
-          ranges
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         def comment_ranges(comments)
           comments.map(&:loc).map(&:expression)
@@ -119,7 +123,7 @@ module RuboCop
         end
 
         def ignored_ranges
-          @ignored_ranges ||= string_literal_ranges(processed_source.ast) +
+          @ignored_ranges ||= ignored_literal_ranges(processed_source.ast) +
                               comment_ranges(processed_source.comments)
         end
 

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

@@ -6,7 +6,7 @@ module RuboCop
       # Ensures that each item in a multi-line array
       # starts on a separate line.
       #
-      # @example AllowMultilineFinalElement: false (default)
+      # @example
       #
       #   # bad
       #   [
@@ -14,11 +14,6 @@ module RuboCop
       #     c
       #   ]
       #
-      #   # bad
-      #   [ a, b, foo(
-      #     bar
-      #   )]
-      #
       #   # good
       #   [
       #     a,
@@ -35,34 +30,20 @@ module RuboCop
       #     )
       #   ]
       #
-      # @example AllowMultilineFinalElement: true
+      # @example AllowMultilineFinalElement: false (default)
       #
       #   # bad
-      #   [
-      #     a, b,
-      #     c
-      #   ]
-      #
-      #   # good
-      #   [ a, b, foo(
+      #   [a, b, foo(
       #     bar
       #   )]
       #
-      #   # good
-      #   [
-      #     a,
-      #     b,
-      #     c
-      #   ]
+      # @example AllowMultilineFinalElement: true
       #
       #   # good
-      #   [
-      #     a,
-      #     b,
-      #     foo(
-      #       bar
-      #     )
-      #   ]
+      #   [a, b, foo(
+      #     bar
+      #   )]
+      #
       class MultilineArrayLineBreaks < Base
         include MultilineElementLineBreaks
         extend AutoCorrector

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

@@ -6,7 +6,7 @@ module RuboCop
       # Ensures that each key in a multi-line hash
       # starts on a separate line.
       #
-      # @example AllowMultilineFinalElement: false (default)
+      # @example
       #
       #   # bad
       #   {
@@ -14,11 +14,6 @@ module RuboCop
       #     c: 3
       #   }
       #
-      #   # bad
-      #   { a: 1, b: {
-      #     c: 3,
-      #   }}
-      #
       #   # good
       #   {
       #     a: 1,
@@ -34,34 +29,20 @@ module RuboCop
       #     }
       #   }
       #
-      # @example AllowMultilineFinalElement: true
+      # @example AllowMultilineFinalElement: false (default)
       #
       #   # bad
-      #   {
-      #     a: 1, b: 2,
-      #     c: 3
-      #   }
-      #
-      #   # good
       #   { a: 1, b: {
       #     c: 3,
       #   }}
       #
-      #   # good
-      #   {
-      #     a: 1,
-      #     b: 2,
-      #     c: 3
-      #   }
-      #
+      # @example AllowMultilineFinalElement: true
       #
       #   # good
-      #   {
-      #     a: 1,
-      #     b: {
-      #       c: 3,
-      #     }
-      #   }
+      #   { a: 1, b: {
+      #     c: 3,
+      #   }}
+      #
       class MultilineHashKeyLineBreaks < Base
         include MultilineElementLineBreaks
         extend AutoCorrector

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

@@ -9,7 +9,7 @@ module RuboCop
       # NOTE: This cop does not move the first argument, if you want that to
       # be on a separate line, see `Layout/FirstMethodArgumentLineBreak`.
       #
-      # @example AllowMultilineFinalElement: false (default)
+      # @example
       #
       #   # bad
       #   foo(a, b,
@@ -31,6 +31,8 @@ module RuboCop
       #   # good
       #   foo(a, b, c)
       #
+      # @example AllowMultilineFinalElement: false (default)
+      #
       #   # good
       #   foo(
       #     a,
@@ -42,26 +44,6 @@ module RuboCop
       #
       # @example AllowMultilineFinalElement: true
       #
-      #   # bad
-      #   foo(a, b,
-      #     c
-      #   )
-      #
-      #   # good
-      #   foo(a, b, {
-      #     foo: "bar",
-      #   })
-      #
-      #   # good
-      #   foo(
-      #     a,
-      #     b,
-      #     c
-      #   )
-      #
-      #   # good
-      #   foo(a, b, c)
-      #
       #   # good
       #   foo(
       #     a,
@@ -70,6 +52,7 @@ module RuboCop
       #       foo: "bar",
       #     }
       #   )
+      #
       class MultilineMethodArgumentLineBreaks < Base
         include MultilineElementLineBreaks
         extend AutoCorrector