rubocop 1.12.1 → 1.16.1

data/lib/rubocop/cop/mixin/method_complexity.rb

@@ -60,9 +60,7 @@ module RuboCop
                      abc_vector: abc_vector,
                      max: max)
 
-        add_offense(node, message: msg) do
-          self.max = complexity.ceil
-        end
+        add_offense(node, message: msg) { self.max = complexity.ceil }
       end
 
       def complexity(body)

data/lib/rubocop/cop/mixin/method_preference.rb

@@ -18,8 +18,7 @@ module RuboCop
             default = default_cop_config['PreferredMethods']
             merged = cop_config['PreferredMethods']
             overrides = merged.values - default.values
-            merged.reject { |key, _| overrides.include?(key) }
-                  .map { |k, v| [k.to_sym, v] }.to_h
+            merged.reject { |key, _| overrides.include?(key) }.transform_keys(&:to_sym)
           end
       end
 

data/lib/rubocop/cop/mixin/multiline_element_indentation.rb

@@ -28,8 +28,7 @@ module RuboCop
         expected_column = base_column(left_brace, left_parenthesis) +
                           configured_indentation_width + offset
         @column_delta = expected_column - actual_column
-        styles =
-          detected_styles(actual_column, offset, left_parenthesis, left_brace)
+        styles = detected_styles(actual_column, offset, left_parenthesis, left_brace)
 
         if @column_delta.zero?
           check_expected_style(styles)

data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb

@@ -16,9 +16,7 @@ module RuboCop
         last_seen_line = -1
         children.each do |child|
           if last_seen_line >= child.first_line
-            add_offense(child) do |corrector|
-              EmptyLineCorrector.insert_before(corrector, child)
-            end
+            add_offense(child) { |corrector| EmptyLineCorrector.insert_before(corrector, child) }
           else
             last_seen_line = child.last_line
           end

data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb

@@ -6,12 +6,10 @@ module RuboCop
     # operations.
     module MultilineExpressionIndentation # rubocop:disable Metrics/ModuleLength
       KEYWORD_ANCESTOR_TYPES  = %i[for if while until return].freeze
-      UNALIGNED_RHS_TYPES     = %i[if while until for return
-                                   array kwbegin].freeze
+      UNALIGNED_RHS_TYPES     = %i[if while until for return array kwbegin].freeze
       DEFAULT_MESSAGE_TAIL    = 'an expression'
       ASSIGNMENT_MESSAGE_TAIL = 'an expression in an assignment'
-      KEYWORD_MESSAGE_TAIL    = 'a %<kind>s in %<article>s `%<keyword>s` ' \
-                                'statement'
+      KEYWORD_MESSAGE_TAIL    = 'a %<kind>s in %<article>s `%<keyword>s` statement'
 
       def on_send(node)
         return if !node.receiver || node.method?(:[])
@@ -55,8 +53,7 @@ module RuboCop
         kw_node = kw_node_with_special_indentation(node)
         if kw_node && !postfix_conditional?(kw_node)
           # This cop could have its own IndentationWidth configuration
-          configured_indentation_width +
-            @config.for_cop('Layout/IndentationWidth')['Width']
+          configured_indentation_width + @config.for_cop('Layout/IndentationWidth')['Width']
         else
           configured_indentation_width
         end
@@ -91,9 +88,7 @@ module RuboCop
           return keyword_message_tail(ancestor)
         end
 
-        part_of_assignment_rhs(node, rhs) do |_node|
-          return ASSIGNMENT_MESSAGE_TAIL
-        end
+        part_of_assignment_rhs(node, rhs) { |_node| return ASSIGNMENT_MESSAGE_TAIL }
 
         DEFAULT_MESSAGE_TAIL
       end
@@ -103,9 +98,7 @@ module RuboCop
         kind    = keyword == 'for' ? 'collection' : 'condition'
         article = keyword.start_with?('i', 'u') ? 'an' : 'a'
 
-        format(KEYWORD_MESSAGE_TAIL, kind: kind,
-                                     article: article,
-                                     keyword: keyword)
+        format(KEYWORD_MESSAGE_TAIL, kind: kind, article: article, keyword: keyword)
       end
 
       def kw_node_with_special_indentation(node)
@@ -143,9 +136,7 @@ module RuboCop
           next unless kind == :with_or_without_parentheses ||
                       kind == :with_parentheses && parentheses?(a)
 
-          a.arguments.any? do |arg|
-            within_node?(node, arg)
-          end
+          a.arguments.any? { |arg| within_node?(node, arg) }
         end
       end
 
@@ -180,8 +171,7 @@ module RuboCop
 
       # The []= operator and setters (a.b = c) are parsed as :send nodes.
       def valid_method_rhs_candidate?(candidate, node)
-        node.setter_method? &&
-          valid_rhs_candidate?(candidate, node.last_argument)
+        node.setter_method? && valid_rhs_candidate?(candidate, node.last_argument)
       end
 
       def valid_rhs_candidate?(candidate, node)

data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb

@@ -24,8 +24,7 @@ module RuboCop
       #    b # comment
       #   ].some_method
       def new_line_needed_before_closing_brace?(node)
-        last_element_line =
-          last_element_range_with_trailing_comma(node).last_line
+        last_element_line = last_element_range_with_trailing_comma(node).last_line
 
         last_element_commented = processed_source.comment_at_line(last_element_line)
 

data/lib/rubocop/cop/mixin/negative_conditional.rb

@@ -7,8 +7,7 @@ module RuboCop
     module NegativeConditional
       extend NodePattern::Macros
 
-      MSG = 'Favor `%<inverse>s` over `%<current>s` for ' \
-            'negative conditions.'
+      MSG = 'Favor `%<inverse>s` over `%<current>s` for negative conditions.'
 
       private
 

data/lib/rubocop/cop/mixin/ordered_gem_node.rb

@@ -25,10 +25,7 @@ module RuboCop
       end
 
       def consecutive_lines(previous, current)
-        first_line = get_source_range(
-          current,
-          treat_comments_as_separators
-        ).first_line
+        first_line = get_source_range(current, treat_comments_as_separators).first_line
         previous.source_range.last_line == first_line - 1
       end
 

data/lib/rubocop/cop/mixin/percent_array.rb

@@ -37,9 +37,7 @@ module RuboCop
 
         return unless style == :brackets
 
-        add_offense(node) do |corrector|
-          correct_bracketed(corrector, node)
-        end
+        add_offense(node) { |corrector| correct_bracketed(corrector, node) }
       end
 
       def check_bracketed_array(node, literal_prefix)

data/lib/rubocop/cop/mixin/percent_literal.rb

@@ -27,12 +27,6 @@ module RuboCop
       def type(node)
         node.loc.begin.source[0..-2]
       end
-
-      # A range containing only the contents of the percent literal (e.g. in
-      # %i{1 2 3} this will be the range covering '1 2 3' only)
-      def contents_range(node)
-        range_between(node.loc.begin.end_pos, node.loc.end.begin_pos)
-      end
     end
   end
 end

data/lib/rubocop/cop/mixin/preceding_following_alignment.rb

@@ -50,9 +50,7 @@ module RuboCop
       end
 
       def aligned_with_any_line?(line_ranges, range, indent = nil, &predicate)
-        line_ranges.any? do |line_nos|
-          aligned_with_line?(line_nos, range, indent, &predicate)
-        end
+        line_ranges.any? { |line_nos| aligned_with_line?(line_nos, range, indent, &predicate) }
       end
 
       def aligned_with_line?(line_nos, range, indent = nil)
@@ -103,15 +101,13 @@ module RuboCop
       end
 
       def aligned_with_assignment(token, line_range)
-        token_line_indent    = processed_source
-                               .line_indentation(token.line)
+        token_line_indent    = processed_source.line_indentation(token.line)
         assignment_lines     = relevant_assignment_lines(line_range)
         relevant_line_number = assignment_lines[1]
 
         return :none unless relevant_line_number
 
-        relevant_indent = processed_source
-                          .line_indentation(relevant_line_number)
+        relevant_indent = processed_source.line_indentation(relevant_line_number)
 
         return :none if relevant_indent < token_line_indent
 
@@ -144,8 +140,7 @@ module RuboCop
       # rubocop:disable Metrics/PerceivedComplexity, Metrics/MethodLength
       def relevant_assignment_lines(line_range)
         result                        = []
-        original_line_indent          = processed_source
-                                        .line_indentation(line_range.first)
+        original_line_indent          = processed_source.line_indentation(line_range.first)
         relevant_line_indent_at_level = true
 
         line_range.each do |line_number|
@@ -161,8 +156,7 @@ module RuboCop
                                    current_line_indent == original_line_indent
 
           unless blank_line
-            relevant_line_indent_at_level = \
-              current_line_indent == original_line_indent
+            relevant_line_indent_at_level = current_line_indent == original_line_indent
           end
         end
 

data/lib/rubocop/cop/mixin/preferred_delimiters.rb

@@ -21,12 +21,10 @@ module RuboCop
       private
 
       def ensure_valid_preferred_delimiters
-        invalid = preferred_delimiters_config.keys -
-                  (PERCENT_LITERAL_TYPES + %w[default])
+        invalid = preferred_delimiters_config.keys - (PERCENT_LITERAL_TYPES + %w[default])
         return if invalid.empty?
 
-        raise ArgumentError,
-              "Invalid preferred delimiter config key: #{invalid.join(', ')}"
+        raise ArgumentError, "Invalid preferred delimiter config key: #{invalid.join(', ')}"
       end
 
       def preferred_delimiters
@@ -36,8 +34,7 @@ module RuboCop
 
             if preferred_delimiters_config.key?('default')
               PERCENT_LITERAL_TYPES.map do |type|
-                [type, preferred_delimiters_config[type] ||
-                  preferred_delimiters_config['default']]
+                [type, preferred_delimiters_config[type] || preferred_delimiters_config['default']]
               end.to_h
             else
               preferred_delimiters_config

data/lib/rubocop/cop/mixin/range_help.rb

@@ -27,6 +27,12 @@ module RuboCop
         Parser::Source::Range.new(source_buffer, begin_pos, end_pos)
       end
 
+      # A range containing only the contents of a literal with delimiters (e.g. in
+      # `%i{1 2 3}` this will be the range covering `1 2 3` only).
+      def contents_range(node)
+        range_between(node.loc.begin.end_pos, node.loc.end.begin_pos)
+      end
+
       def range_between(start_pos, end_pos)
         Parser::Source::Range.new(processed_source.buffer, start_pos, end_pos)
       end
@@ -54,15 +60,9 @@ module RuboCop
         go_left, go_right = directions(side)
 
         begin_pos = range.begin_pos
-        if go_left
-          begin_pos =
-            final_pos(src, begin_pos, -1, continuations, newlines, whitespace)
-        end
+        begin_pos = final_pos(src, begin_pos, -1, continuations, newlines, whitespace) if go_left
         end_pos = range.end_pos
-        if go_right
-          end_pos =
-            final_pos(src, end_pos, 1, continuations, newlines, whitespace)
-        end
+        end_pos = final_pos(src, end_pos, 1, continuations, newlines, whitespace) if go_right
         Parser::Source::Range.new(buffer, begin_pos, end_pos)
       end
 
@@ -73,9 +73,7 @@ module RuboCop
         end_offset = last_line.length - range.last_column
         end_offset += 1 if include_final_newline
 
-        range
-          .adjust(begin_pos: -range.column, end_pos: end_offset)
-          .intersect(buffer.source_range)
+        range.adjust(begin_pos: -range.column, end_pos: end_offset).intersect(buffer.source_range)
       end
 
       def column_offset_between(base_range, range)
@@ -89,8 +87,7 @@ module RuboCop
       # line, in which case 1 is subtracted from the column value. This gives
       # the column as it appears when viewing the file in an editor.
       def effective_column(range)
-        if range.line == 1 &&
-           @processed_source.raw_source.codepoints.first == BYTE_ORDER_MARK
+        if range.line == 1 && @processed_source.raw_source.codepoints.first == BYTE_ORDER_MARK
           range.column - 1
         else
           range.column

data/lib/rubocop/cop/mixin/rescue_node.rb

@@ -5,17 +5,13 @@ module RuboCop
     # Common functionality for checking `rescue` nodes.
     module RescueNode
       def on_new_investigation
-        @modifier_locations = processed_source
-                              .tokens
-                              .select(&:rescue_modifier?)
-                              .map(&:pos)
+        @modifier_locations = processed_source.tokens.select(&:rescue_modifier?).map(&:pos)
       end
 
       private
 
       def rescue_modifier?(node)
-        node&.resbody_type? &&
-          @modifier_locations.include?(node.loc.keyword)
+        node&.resbody_type? && @modifier_locations.include?(node.loc.keyword)
       end
 
       # @deprecated Use ResbodyNode#exceptions instead

data/lib/rubocop/cop/mixin/safe_assignment.rb

@@ -17,8 +17,7 @@ module RuboCop
       def_node_matcher :setter_method?, '[(send ...) setter_method?]'
 
       # @!method safe_assignment?(node)
-      def_node_matcher :safe_assignment?,
-                       '(begin {equals_asgn? #setter_method?})'
+      def_node_matcher :safe_assignment?, '(begin {equals_asgn? #setter_method?})'
 
       def safe_assignment_allowed?
         cop_config['AllowSafeAssignment']

data/lib/rubocop/cop/mixin/space_after_punctuation.rb

@@ -28,13 +28,11 @@ module RuboCop
       end
 
       def space_missing?(token1, token2)
-        token1.line == token2.line &&
-          token2.column == token1.column + offset
+        token1.line == token2.line && token2.column == token1.column + offset
       end
 
       def space_required_before?(token)
-        !(allowed_type?(token) ||
-          (token.right_curly_brace? && space_forbidden_before_rcurly?))
+        !(allowed_type?(token) || (token.right_curly_brace? && space_forbidden_before_rcurly?))
       end
 
       def allowed_type?(token)

data/lib/rubocop/cop/mixin/space_before_punctuation.rb

@@ -25,8 +25,7 @@ module RuboCop
           next unless space_missing?(token1, token2)
           next if space_required_after?(token1)
 
-          pos_before_punctuation = range_between(token1.end_pos,
-                                                 token2.begin_pos)
+          pos_before_punctuation = range_between(token1.end_pos, token2.begin_pos)
 
           yield token2, pos_before_punctuation
         end

data/lib/rubocop/cop/mixin/statement_modifier.rb

@@ -48,9 +48,7 @@ module RuboCop
       end
 
       def to_modifier_form(node)
-        expression = [node.body.source,
-                      node.keyword,
-                      node.condition.source].compact.join(' ')
+        expression = [node.body.source, node.keyword, node.condition.source].compact.join(' ')
         parenthesized = parenthesize?(node) ? "(#{expression})" : expression
         [parenthesized, first_line_comment(node)].compact.join(' ')
       end

data/lib/rubocop/cop/mixin/string_literals_help.rb

@@ -4,18 +4,16 @@ module RuboCop
   module Cop
     # Common functionality for cops checking single/double quotes.
     module StringLiteralsHelp
-      include StringHelp
-
       private
 
-      def wrong_quotes?(node)
-        src = node.source
+      def wrong_quotes?(src_or_node)
+        src = src_or_node.is_a?(RuboCop::AST::Node) ? src_or_node.source : src_or_node
         return false if src.start_with?('%', '?')
 
         if style == :single_quotes
           !double_quotes_required?(src)
         else
-          !/" | \\[^'] | \#(@|\{)/x.match?(src)
+          !/" | \\[^'\\] | \#[@{$]/x.match?(src)
         end
       end
     end

data/lib/rubocop/cop/mixin/symbol_help.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    # Classes that include this module just implement functions for working
+    # with symbol nodes.
+    module SymbolHelp
+      def hash_key?(node)
+        node.parent&.pair_type? && node == node.parent.child_nodes.first
+      end
+    end
+  end
+end

data/lib/rubocop/cop/mixin/trailing_body.rb

@@ -6,8 +6,7 @@ module RuboCop
     module TrailingBody
       def trailing_body?(node)
         body = node.to_a.reverse[0]
-        body && node.multiline? &&
-          body_on_first_line?(node, body)
+        body && node.multiline? && body_on_first_line?(node, body)
       end
 
       def body_on_first_line?(node, body)

data/lib/rubocop/cop/mixin/trailing_comma.rb

@@ -95,8 +95,7 @@ module RuboCop
 
         line = node.loc.selector.nil? ? node.loc.line : node.loc.selector.line
 
-        line == node.last_argument.last_line &&
-          node.last_line == node.last_argument.last_line
+        line == node.last_argument.last_line && node.last_line == node.last_argument.last_line
       end
 
       # A single argument with the closing bracket on the same line as the end

data/lib/rubocop/cop/mixin/uncommunicative_name.rb

@@ -6,10 +6,8 @@ module RuboCop
     module UncommunicativeName
       CASE_MSG = 'Only use lowercase characters for %<name_type>s.'
       NUM_MSG = 'Do not end %<name_type>s with a number.'
-      LENGTH_MSG = '%<name_type>s must be at least %<min>s ' \
-                   'characters long.'
-      FORBIDDEN_MSG = 'Do not use %<name>s as a name for a ' \
-                      '%<name_type>s.'
+      LENGTH_MSG = '%<name_type>s must be at least %<min>s characters long.'
+      FORBIDDEN_MSG = 'Do not use %<name>s as a name for a %<name_type>s.'
 
       def check(node, args)
         args.each do |arg|
@@ -79,9 +77,7 @@ module RuboCop
 
       def arg_range(arg, length)
         begin_pos = arg.source_range.begin_pos
-        Parser::Source::Range.new(processed_source.buffer,
-                                  begin_pos,
-                                  begin_pos + length)
+        Parser::Source::Range.new(processed_source.buffer, begin_pos, begin_pos + length)
       end
 
       def forbidden_offense(node, range, name)