rubocop-ast 1.1.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec19a654b5c38c2a70e811bd7c16a86473bd9fec2444774e9d8ef3cfa9d9de58
-  data.tar.gz: 6a0ef9e9d121c5ba9991bb7cd534f8e180d84718ef093fc0be8099175bf027b4
+  metadata.gz: b2fc7baac2fa613e95c79a9de02f42586585a1aaf0821a77f25ada657e653448
+  data.tar.gz: d16431779a8cc2f5b795fe112de79a6e3628103b3e79fbea7213a8f9fa8da35e
 SHA512:
-  metadata.gz: a720f20464156e92dddd9979ae2dff71a7a5deca84b2e8c717b9165fa9e831b4c15c5f7cba3c33cd8986a2618822ee0e82386e58d1586b1ebefbb5a74f9972b6
-  data.tar.gz: bf26e4aa780bf56d029ca9272825a4a91d8c76f87d88e7c43de8167e06d8e2687d2d450e28f989b77c3d61169a0d91866bfe1504f2069aee3d0d2e16e2ce4444
+  metadata.gz: 2d3cb6e72ed495bae000b28312de6955cfce4eb0aa2a77af7fcb352bc9ea7b2fdb60e74a1b7e1f0ef70169dc6863e1536421606db3b0f197055263b4c3458158
+  data.tar.gz: e9a57e796da77a05151a8c14974aba9737f409761ba48562bd848ad26c1a1c30ae0016ed821e1630d85757583e8e17ffccaa820f9e3f06b9fafa62f939ec9c6c

data/README.md

@@ -35,7 +35,9 @@ See the [docs site](https://docs.rubocop.org/rubocop-ast) for more details.
 
 ### Parser compatibility switches
 
-This gem, by default, uses most [legacy AST output from parser](https://github.com/whitequark/parser/#usage), except for `emit_forward_arg` which is set to `true`.
+This gem, by default, uses most [legacy AST output from parser](https://github.com/whitequark/parser/#usage), except for the following which are set to `true`:
+* `emit_forward_arg`
+* `emit_match_pattern`
 
 The main `RuboCop` gem uses these defaults (and is currently only compatible with these), but this gem can be used separately from `RuboCop` and is meant to be compatible with all settings. For example, to have `-> { ... }` emitted
 as `LambdaNode` instead of `SendNode`:

data/lib/rubocop/ast.rb

@@ -5,7 +5,7 @@ require 'forwardable'
 require 'set'
 
 require_relative 'ast/ext/range'
-require_relative 'ast/ext/set'
+require_relative 'ast/ext/range_min_max'
 require_relative 'ast/node_pattern/method_definer'
 require_relative 'ast/node_pattern'
 require_relative 'ast/node/mixin/descendence'
@@ -36,6 +36,7 @@ require_relative 'ast/node/mixin/predicate_operator_node'
 require_relative 'ast/node/mixin/basic_literal_node'
 require_relative 'ast/node/alias_node'
 require_relative 'ast/node/and_node'
+require_relative 'ast/node/arg_node'
 require_relative 'ast/node/args_node'
 require_relative 'ast/node/array_node'
 require_relative 'ast/node/block_node'
@@ -61,6 +62,7 @@ require_relative 'ast/node/module_node'
 require_relative 'ast/node/next_node'
 require_relative 'ast/node/or_node'
 require_relative 'ast/node/pair_node'
+require_relative 'ast/node/procarg0_node'
 require_relative 'ast/node/range_node'
 require_relative 'ast/node/regexp_node'
 require_relative 'ast/node/rescue_node'
@@ -69,6 +71,7 @@ require_relative 'ast/node/return_node'
 require_relative 'ast/node/self_class_node'
 require_relative 'ast/node/send_node'
 require_relative 'ast/node/str_node'
+require_relative 'ast/node/dstr_node'
 require_relative 'ast/node/super_node'
 require_relative 'ast/node/symbol_node'
 require_relative 'ast/node/until_node'

data/lib/rubocop/ast/builder.rb

@@ -14,12 +14,22 @@ module RuboCop
     #   parser = Parser::Ruby25.new(builder)
     #   root_node = parser.parse(buffer)
     class Builder < Parser::Builders::Default
-      self.emit_forward_arg = true
+      self.emit_forward_arg = true if respond_to?(:emit_forward_arg=)
+      self.emit_match_pattern = true if respond_to?(:emit_match_pattern=)
 
       # @api private
       NODE_MAP = {
         and:          AndNode,
         alias:        AliasNode,
+        arg:          ArgNode,
+        blockarg:     ArgNode,
+        forward_arg:  ArgNode,
+        kwarg:        ArgNode,
+        kwoptarg:     ArgNode,
+        kwrestarg:    ArgNode,
+        optarg:       ArgNode,
+        restarg:      ArgNode,
+        shadowarg:    ArgNode,
         args:         ArgsNode,
         array:        ArrayNode,
         block:        BlockNode,
@@ -32,6 +42,7 @@ module RuboCop
         def:          DefNode,
         defined?:     DefinedNode,
         defs:         DefNode,
+        dstr:         DstrNode,
         ensure:       EnsureNode,
         for:          ForNode,
         forward_args: ForwardArgsNode,
@@ -43,12 +54,14 @@ module RuboCop
         indexasgn:    IndexasgnNode,
         irange:       RangeNode,
         erange:       RangeNode,
+        kwargs:       HashNode,
         kwsplat:      KeywordSplatNode,
         lambda:       LambdaNode,
         module:       ModuleNode,
         next:         NextNode,
         or:           OrNode,
         pair:         PairNode,
+        procarg0:     Procarg0Node,
         regexp:       RegexpNode,
         rescue:       RescueNode,
         resbody:      ResbodyNode,
@@ -56,7 +69,6 @@ module RuboCop
         csend:        SendNode,
         send:         SendNode,
         str:          StrNode,
-        dstr:         StrNode,
         xstr:         StrNode,
         sclass:       SelfClassNode,
         super:        SuperNode,

data/lib/rubocop/ast/ext/range_min_max.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    module Ext
+      # Refinement to circumvent broken `Range#minmax` for infinity ranges in 2.6-
+      module RangeMinMax
+        if ::Range.instance_method(:minmax).owner != ::Range
+          refine ::Range do
+            def minmax
+              [min, max]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/ast/node.rb

@@ -48,7 +48,7 @@ module RuboCop
 
       # @api private
       EQUALS_ASSIGNMENTS = %i[lvasgn ivasgn cvasgn gvasgn
-                              casgn masgn rasgn mrasgn].to_set.freeze
+                              casgn masgn].to_set.freeze
       # @api private
       SHORTHAND_ASSIGNMENTS = %i[op_asgn or_asgn and_asgn].to_set.freeze
       # @api private
@@ -77,7 +77,8 @@ module RuboCop
       # @api private
       SPECIAL_KEYWORDS = %w[__FILE__ __LINE__ __ENCODING__].to_set.freeze
       # @api private
-      ARGUMENT_TYPES = %i[arg optarg restarg kwarg kwoptarg kwrestarg blockarg].to_set.freeze
+      ARGUMENT_TYPES = %i[arg optarg restarg kwarg kwoptarg kwrestarg
+                          blockarg forward_arg shadowarg].to_set.freeze
 
       LITERAL_RECURSIVE_METHODS = (COMPARISON_OPERATORS + %i[* ! <=>]).freeze
       LITERAL_RECURSIVE_TYPES = (OPERATOR_KEYWORDS + COMPOSITE_LITERALS + %i[begin pair]).freeze
@@ -222,7 +223,7 @@ module RuboCop
       # @return [self] if a block is given
       # @return [Enumerator] if no block is given
       def each_ancestor(*types, &block)
-        return to_enum(__method__, *types) unless block_given?
+        return to_enum(__method__, *types) unless block
 
         visit_ancestors(types, &block)
 
@@ -237,7 +238,7 @@ module RuboCop
         each_ancestor.to_a
       end
 
-      # Note: Some rare nodes may have no source, like `s(:args)` in `foo {}`
+      # NOTE: Some rare nodes may have no source, like `s(:args)` in `foo {}`
       # @return [String, nil]
       def source
         loc.expression&.source
@@ -271,10 +272,12 @@ module RuboCop
 
       ## Destructuring
 
+      # @!method receiver(node = self)
       def_node_matcher :receiver, <<~PATTERN
         {(send $_ ...) ({block numblock} (send $_ ...) ...)}
       PATTERN
 
+      # @!method str_content(node = self)
       def_node_matcher :str_content, '(str $_)'
 
       def const_name
@@ -288,6 +291,7 @@ module RuboCop
         end
       end
 
+      # @!method defined_module0(node = self)
       def_node_matcher :defined_module0, <<~PATTERN
         {(class (const $_ $_) ...)
          (module (const $_ $_) ...)
@@ -333,6 +337,7 @@ module RuboCop
       end
 
       # Some cops treat the shovel operator as a kind of assignment.
+      # @!method assignment_or_similar?(node = self)
       def_node_matcher :assignment_or_similar?, <<~PATTERN
         {assignment? (send _recv :<< ...)}
       PATTERN
@@ -410,7 +415,7 @@ module RuboCop
         POST_CONDITION_LOOP_TYPES.include?(type)
       end
 
-      # Note: `loop { }` is a normal method call and thus not a loop keyword.
+      # NOTE: `loop { }` is a normal method call and thus not a loop keyword.
       def loop_keyword?
         LOOP_TYPES.include?(type)
       end
@@ -468,37 +473,47 @@ module RuboCop
         node.match_guard_clause?
       end
 
+      # @!method match_guard_clause?(node = self)
       def_node_matcher :match_guard_clause?, <<~PATTERN
         [${(send nil? {:raise :fail} ...) return break next} single_line?]
       PATTERN
 
+      # @!method proc?(node = self)
       def_node_matcher :proc?, <<~PATTERN
         {(block (send nil? :proc) ...)
          (block (send #global_const?(:Proc) :new) ...)
          (send #global_const?(:Proc) :new)}
       PATTERN
 
+      # @!method lambda?(node = self)
       def_node_matcher :lambda?, '({block numblock} (send nil? :lambda) ...)'
+
+      # @!method lambda_or_proc?(node = self)
       def_node_matcher :lambda_or_proc?, '{lambda? proc?}'
 
+      # @!method global_const?(node = self, name)
       def_node_matcher :global_const?, '(const {nil? cbase} %1)'
 
+      # @!method class_constructor?(node = self)
       def_node_matcher :class_constructor?, <<~PATTERN
         {       (send #global_const?({:Class :Module :Struct}) :new ...)
          (block (send #global_const?({:Class :Module :Struct}) :new ...) ...)}
       PATTERN
 
       # @deprecated Use `:class_constructor?`
+      # @!method struct_constructor?(node = self)
       def_node_matcher :struct_constructor?, <<~PATTERN
         (block (send #global_const?(:Struct) :new ...) _ $_)
       PATTERN
 
+      # @!method class_definition?(node = self)
       def_node_matcher :class_definition?, <<~PATTERN
         {(class _ _ $_)
          (sclass _ $_)
          (block (send #global_const?({:Struct :Class}) :new ...) _ $_)}
       PATTERN
 
+      # @!method module_definition?(node = self)
       def_node_matcher :module_definition?, <<~PATTERN
         {(module _ $_)
          (block (send #global_const?(:Module) :new ...) _ $_)}
@@ -632,6 +647,7 @@ module RuboCop
         end
       end
 
+      # @!method new_class_or_module_block?(node = self)
       def_node_matcher :new_class_or_module_block?, <<~PATTERN
         ^(casgn _ _ (block (send (const _ {:Class :Module}) :new) ...))
       PATTERN

data/lib/rubocop/ast/node/arg_node.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    # A node extension for `arg`, `optarg`, `restarg`, `kwarg`, `kwoptarg`,
+    # `kwrestarg`, `blockarg`, `shadowarg` and `forward_arg` nodes.
+    # This will be used in place of a plain node when the builder constructs
+    # the AST, making its methods available to all `arg` nodes within RuboCop.
+    class ArgNode < Node
+      # Returns the name of an argument.
+      #
+      # @return [Symbol, nil] the name of the argument
+      def name
+        node_parts[0]
+      end
+
+      # Returns the default value of the argument, if any.
+      #
+      # @return [Node, nil] the default value of the argument
+      def default_value
+        return unless default?
+
+        node_parts[1]
+      end
+
+      # Checks whether the argument has a default value
+      #
+      # @return [Boolean] whether the argument has a default value
+      def default?
+        optarg_type? || kwoptarg_type?
+      end
+    end
+  end
+end

data/lib/rubocop/ast/node/args_node.rb

@@ -24,6 +24,16 @@ module RuboCop
       def empty_and_without_delimiters?
         loc.expression.nil?
       end
+
+      # Yield each argument from the collection.
+      # Arguments can be inside `mlhs` nodes in the case of destructuring, so this
+      # flattens the collection to just `arg`, `optarg`, `restarg`, `kwarg`,
+      # `kwoptarg`, `kwrestarg`, `blockarg`, `forward_arg` and `shadowarg`.
+      #
+      # @return [Array<Node>] array of argument nodes.
+      def argument_list
+        each_descendant(*ARGUMENT_TYPES).to_a.freeze
+      end
     end
   end
 end

data/lib/rubocop/ast/node/array_node.rb

@@ -19,7 +19,7 @@ module RuboCop
 
       # @deprecated Use `values.each` (a.k.a. `children.each`)
       def each_value(&block)
-        return to_enum(__method__) unless block_given?
+        return to_enum(__method__) unless block
 
         values.each(&block)
 

data/lib/rubocop/ast/node/block_node.rb

@@ -22,6 +22,9 @@ module RuboCop
       end
 
       # The arguments of this block.
+      # Note that if the block has destructured arguments, `arguments` will
+      # return a `mlhs` node, whereas `argument_list` will return only
+      # actual argument nodes.
       #
       # @return [Array<Node>]
       def arguments
@@ -32,6 +35,18 @@ module RuboCop
         end
       end
 
+      # Returns a collection of all descendants of this node that are
+      # argument type nodes. See `ArgsNode#argument_list` for details.
+      #
+      # @return [Array<Node>]
+      def argument_list
+        if numblock_type?
+          numbered_arguments
+        else
+          arguments.argument_list
+        end
+      end
+
       # The body of this block.
       #
       # @return [Node, nil] the body of the `block` node or `nil`
@@ -117,6 +132,18 @@ module RuboCop
       def void_context?
         VOID_CONTEXT_METHODS.include?(method_name)
       end
+
+      private
+
+      # Numbered arguments of this `numblock`.
+      def numbered_arguments
+        return [].freeze unless numblock_type?
+
+        max_param = children[1]
+        1.upto(max_param).map do |i|
+          ArgNode.new(:arg, [:"_#{i}"])
+        end.freeze
+      end
     end
   end
 end

data/lib/rubocop/ast/node/case_match_node.rb

@@ -17,7 +17,7 @@ module RuboCop
 
       # @deprecated Use `in_pattern_branches.each`
       def each_in_pattern(&block)
-        return in_pattern_branches.to_enum(__method__) unless block_given?
+        return in_pattern_branches.to_enum(__method__) unless block
 
         in_pattern_branches.each(&block)
 

data/lib/rubocop/ast/node/case_node.rb

@@ -17,7 +17,7 @@ module RuboCop
 
       # @deprecated Use `when_branches.each`
       def each_when(&block)
-        return when_branches.to_enum(__method__) unless block_given?
+        return when_branches.to_enum(__method__) unless block
 
         when_branches.each(&block)
 

data/lib/rubocop/ast/node/const_node.rb

@@ -45,7 +45,7 @@ module RuboCop
       #      s(:const, :Foo), then
       #      s(:const, s(:const, :Foo), :Bar)
       def each_path(&block)
-        return to_enum(__method__) unless block_given?
+        return to_enum(__method__) unless block
 
         descendants = []
         last = self

data/lib/rubocop/ast/node/dstr_node.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    # A node extension for `dstr` nodes. This will be used
+    # in place of a plain node when the builder constructs the AST, making
+    # its methods available to all `dstr` nodes within RuboCop.
+    class DstrNode < StrNode
+      def value
+        child_nodes.map do |child|
+          child.respond_to?(:value) ? child.value : child.source
+        end.join
+      end
+    end
+  end
+end

data/lib/rubocop/ast/node/hash_node.rb

@@ -57,7 +57,7 @@ module RuboCop
       # @return [self] if a block is given
       # @return [Enumerator] if no block is given
       def each_key(&block)
-        return pairs.map(&:key).to_enum unless block_given?
+        return pairs.map(&:key).to_enum unless block
 
         pairs.map(&:key).each(&block)
 
@@ -81,7 +81,7 @@ module RuboCop
       # @return [self] if a block is given
       # @return [Enumerator] if no block is given
       def each_value(&block)
-        return pairs.map(&:value).to_enum unless block_given?
+        return pairs.map(&:value).to_enum unless block
 
         pairs.map(&:value).each(&block)
 

data/lib/rubocop/ast/node/if_node.rb

@@ -162,7 +162,7 @@ module RuboCop
 
       # @deprecated Use `branches.each`
       def each_branch(&block)
-        return branches.to_enum(__method__) unless block_given?
+        return branches.to_enum(__method__) unless block
 
         branches.each(&block)
       end

data/lib/rubocop/ast/node/mixin/descendence.rb

@@ -13,13 +13,9 @@ module RuboCop
       #
       # @overload each_child_node
       #   Yield all nodes.
-      # @overload each_child_node(type)
-      #   Yield only nodes matching the type.
-      #   @param [Symbol] type a node type
-      # @overload each_child_node(type_a, type_b, ...)
+      # @overload each_child_node(type, ...)
       #   Yield only nodes matching any of the types.
-      #   @param [Symbol] type_a a node type
-      #   @param [Symbol] type_b a node type
+      #   @param [Symbol] type a node type
       # @yieldparam [Node] node each child node
       # @return [self] if a block is given
       # @return [Enumerator] if no block is given
@@ -59,7 +55,7 @@ module RuboCop
       # @return [self] if a block is given
       # @return [Enumerator] if no block is given
       def each_descendant(*types, &block)
-        return to_enum(__method__, *types) unless block_given?
+        return to_enum(__method__, *types) unless block
 
         visit_descendants(types, &block)
 
@@ -94,7 +90,7 @@ module RuboCop
       # @return [self] if a block is given
       # @return [Enumerator] if no block is given
       def each_node(*types, &block)
-        return to_enum(__method__, *types) unless block_given?
+        return to_enum(__method__, *types) unless block
 
         yield self if types.empty? || types.include?(type)
 

data/lib/rubocop/ast/node/mixin/method_dispatch_node.rb

@@ -224,6 +224,7 @@ module RuboCop
 
       private
 
+      # @!method in_macro_scope?(node = self)
       def_node_matcher :in_macro_scope?, <<~PATTERN
         {
           root?                                    # Either a root node,
@@ -239,14 +240,17 @@ module RuboCop
         }
       PATTERN
 
+      # @!method adjacent_def_modifier?(node = self)
       def_node_matcher :adjacent_def_modifier?, <<~PATTERN
         (send nil? _ ({def defs} ...))
       PATTERN
 
+      # @!method bare_access_modifier_declaration?(node = self)
       def_node_matcher :bare_access_modifier_declaration?, <<~PATTERN
         (send nil? {:public :protected :private :module_function})
       PATTERN
 
+      # @!method non_bare_access_modifier_declaration?(node = self)
       def_node_matcher :non_bare_access_modifier_declaration?, <<~PATTERN
         (send nil? {:public :protected :private :module_function} _)
       PATTERN

data/lib/rubocop/ast/node/procarg0_node.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    # A node extension for `procarg0` nodes.
+    # This will be used in place of a plain node when the builder constructs
+    # the AST, making its methods available to all `arg` nodes within RuboCop.
+    class Procarg0Node < ArgNode
+      # Returns the name of an argument.
+      #
+      # @return [Symbol, nil] the name of the argument
+      def name
+        node_parts[0].name
+      end
+    end
+  end
+end

data/lib/rubocop/ast/node/regexp_node.rb

@@ -25,7 +25,7 @@ module RuboCop
         children.last
       end
 
-      # Note: The 'o' option is ignored.
+      # NOTE: The 'o' option is ignored.
       #
       # @return [Integer] the Regexp option bits as returned by Regexp#options
       def options

data/lib/rubocop/ast/node/send_node.rb

@@ -9,6 +9,7 @@ module RuboCop
       include ParameterizedNode::RestArguments
       include MethodDispatchNode
 
+      # @!method attribute_accessor?(node = self)
       def_node_matcher :attribute_accessor?, <<~PATTERN
         [(send nil? ${:attr_reader :attr_writer :attr_accessor :attr} $...)
          (_    _    _                                                 _ ...)]

data/lib/rubocop/ast/node/when_node.rb

@@ -15,7 +15,7 @@ module RuboCop
 
       # @deprecated Use `conditions.each`
       def each_condition(&block)
-        return conditions.to_enum(__method__) unless block_given?
+        return conditions.to_enum(__method__) unless block
 
         conditions.each(&block)
 

data/lib/rubocop/ast/node_pattern.rb

@@ -28,7 +28,7 @@ module RuboCop
       module Macros
         # Define a method which applies a pattern to an AST node
         #
-        # The new method will return nil if the node does not match
+        # The new method will return nil if the node does not match.
         # If the node matches, and a block is provided, the new method will
         # yield to the block (passing any captures as block arguments).
         # If the node matches, and no block is provided, the new method will
@@ -103,7 +103,7 @@ module RuboCop
       # Yields its argument and any descendants, depth-first.
       #
       def self.descend(element, &block)
-        return to_enum(__method__, element) unless block_given?
+        return to_enum(__method__, element) unless block
 
         yield element
 

data/lib/rubocop/ast/node_pattern/compiler.rb

@@ -33,7 +33,7 @@ module RuboCop
           name
         end
 
-        # Enumerates `enum` while keeping track of state accross
+        # Enumerates `enum` while keeping track of state across
         # union branches (captures and unification).
         def each_union(enum, &block)
           enforce_same_captures(binding.union_bind(enum), &block)

data/lib/rubocop/ast/node_pattern/compiler/sequence_subcompiler.rb

@@ -40,7 +40,7 @@ module RuboCop
                                                 #             sequence head
                                                 # :variadic_mode : child index held by @cur_index_var
                                                 # >= 0 : when the current child index is known
-                                                #        (from the begining)
+                                                #        (from the beginning)
                                                 # < 0 :  when the index is known from the end,
                                                 #        where -1 is *past the end*,
                                                 #        -2 is the last child, etc...
@@ -328,7 +328,7 @@ module RuboCop
             "#{@seq_var}.children.size - #{-(cur + DELTA)}"
           end
 
-          # Note: assumes `@cur_index != :seq_head`. Node types using `within_loop` must
+          # NOTE: assumes `@cur_index != :seq_head`. Node types using `within_loop` must
           # have `def in_sequence_head; :raise; end`
           def within_loop
             sync do |sync_code|

data/lib/rubocop/ast/node_pattern/lexer.rb

@@ -52,7 +52,7 @@ module RuboCop
         def emit_regexp
           body = ss[1]
           options = ss[2]
-          flag = options.each_char.map { |c| REGEXP_OPTIONS[c] }.sum
+          flag = options.each_char.sum { |c| REGEXP_OPTIONS[c] }
 
           emit(:tREGEXP) { Regexp.new(body, flag) }
         end

data/lib/rubocop/ast/node_pattern/lexer.rex

@@ -13,7 +13,8 @@ class RuboCop::AST::NodePattern::LexerRex
 macros
         CONST_NAME                /[A-Z:][a-zA-Z_:]+/
         SYMBOL_NAME               /[\w+@*\/?!<>=~|%^-]+|\[\]=?/
-        IDENTIFIER                /[a-zA-Z_][a-zA-Z0-9_-]*/
+        IDENTIFIER                /[a-z][a-zA-Z0-9_]*/
+        NODE_TYPE                 /[a-z][a-zA-Z0-9_-]*/  # Same as identifier but allows '-'
         CALL                      /(?:#{CONST_NAME}\.)?#{IDENTIFIER}[!?]?/
         REGEXP_BODY               /(?:[^\/]|\\\/)*/
         REGEXP                    /\/(#{REGEXP_BODY})(?<!\\)\/([imxo]*)/
@@ -27,14 +28,14 @@ rules
           %w"( ) { | } [ ] < > $ ! ^ ` ... + * ? ,"
         )}/o                      { emit ss.matched, &:to_sym }
         /#{REGEXP}/o              { emit_regexp }
-        /%(#{CONST_NAME})/o       { emit :tPARAM_CONST }
+        /%?(#{CONST_NAME})/o      { emit :tPARAM_CONST }
         /%([a-z_]+)/              { emit :tPARAM_NAMED }
         /%(\d*)/                  { emit(:tPARAM_NUMBER) { |s| s.empty? ? 1 : s.to_i } } # Map `%` to `%1`
         /_(#{IDENTIFIER})/o       { emit :tUNIFY }
         /_/o                      { emit :tWILDCARD }
         /\#(#{CALL})/o            { @state = :ARG; emit :tFUNCTION_CALL, &:to_sym }
         /#{IDENTIFIER}\?/o        { @state = :ARG; emit :tPREDICATE, &:to_sym }
-        /#{IDENTIFIER}/o          { emit :tNODE_TYPE, &:to_sym }
+        /#{NODE_TYPE}/o           { emit :tNODE_TYPE, &:to_sym }
   :ARG  /\(/                      { @state = nil; emit :tARG_LIST }
   :ARG  //                        { @state = nil }
         /\#.*/                    { emit_comment }

data/lib/rubocop/ast/node_pattern/lexer.rex.rb

@@ -26,7 +26,8 @@ class RuboCop::AST::NodePattern::LexerRex
   # :stopdoc:
   CONST_NAME  = /[A-Z:][a-zA-Z_:]+/
   SYMBOL_NAME = /[\w+@*\/?!<>=~|%^-]+|\[\]=?/
-  IDENTIFIER  = /[a-zA-Z_][a-zA-Z0-9_-]*/
+  IDENTIFIER  = /[a-z][a-zA-Z0-9_]*/
+  NODE_TYPE   = /[a-z][a-zA-Z0-9_-]*/
   CALL        = /(?:#{CONST_NAME}\.)?#{IDENTIFIER}[!?]?/
   REGEXP_BODY = /(?:[^\/]|\\\/)*/
   REGEXP      = /\/(#{REGEXP_BODY})(?<!\\)\/([imxo]*)/
@@ -134,7 +135,7 @@ class RuboCop::AST::NodePattern::LexerRex
             action { emit ss.matched, &:to_sym }
           when ss.skip(/#{REGEXP}/o) then
             action { emit_regexp }
-          when ss.skip(/%(#{CONST_NAME})/o) then
+          when ss.skip(/%?(#{CONST_NAME})/o) then
             action { emit :tPARAM_CONST }
           when ss.skip(/%([a-z_]+)/) then
             action { emit :tPARAM_NAMED }
@@ -148,7 +149,7 @@ class RuboCop::AST::NodePattern::LexerRex
             action { @state = :ARG; emit :tFUNCTION_CALL, &:to_sym }
           when ss.skip(/#{IDENTIFIER}\?/o) then
             action { @state = :ARG; emit :tPREDICATE, &:to_sym }
-          when ss.skip(/#{IDENTIFIER}/o) then
+          when ss.skip(/#{NODE_TYPE}/o) then
             action { emit :tNODE_TYPE, &:to_sym }
           when ss.skip(/\#.*/) then
             action { emit_comment }

data/lib/rubocop/ast/node_pattern/method_definer.rb

@@ -56,6 +56,8 @@ module RuboCop
           end
           src = yield method_name
           base.class_eval(src, location.path, location.lineno)
+
+          method_name
         end
 
         def emit_node_search(method_name)

data/lib/rubocop/ast/node_pattern/node.rb

@@ -7,12 +7,13 @@ module RuboCop
       class Node < ::Parser::AST::Node
         extend Forwardable
         include ::RuboCop::AST::Descendence
+        using Ext::RangeMinMax
 
         MATCHES_WITHIN_SET = %i[symbol number string].to_set.freeze
         private_constant :MATCHES_WITHIN_SET
 
         ###
-        # To be overriden by subclasses
+        # To be overridden by subclasses
         ###
 
         def rest?
@@ -59,7 +60,7 @@ module RuboCop
         end
 
         # @return [Boolean] returns true for nodes having a Ruby literal equivalent
-        # that matches withing a Set (e.g. `42`, `:sym` but not `/regexp/`)
+        # that matches within a Set (e.g. `42`, `:sym` but not `/regexp/`)
         def matches_within_set?
           MATCHES_WITHIN_SET.include?(type)
         end
@@ -197,27 +198,13 @@ module RuboCop
           end
         end
 
-        # Circumvent broken `Range#minmax` for infinity ranges in 2.6-
-        module MapMinMax
-          if RUBY_VERSION >= '2.7'
-            def map_min_max(enum)
-              enum.map(&:minmax)
-            end
-          else
-            def map_min_max(enum)
-              enum.map { |r| [r.min, r.max] } # rubocop:disable Style/MinMax
-            end
-          end
-        end
-
         # A list (potentially empty) of nodes; part of a Union
         class Subsequence < Node
           include ForbidInSeqHead
-          include MapMinMax
 
           def arity
-            min, max = map_min_max(children.map(&:arity_range)).transpose.map(&:sum)
-            min == max ? min || 0 : min..max # Note: || 0 for empty case, where min == max == nil.
+            min, max = children.map(&:arity_range).map(&:minmax).transpose.map(&:sum)
+            min == max ? min || 0 : min..max # NOTE: || 0 for empty case, where min == max == nil.
           end
 
           def in_sequence_head
@@ -231,10 +218,8 @@ module RuboCop
 
         # Node class for `{ ... }`
         class Union < Node
-          include MapMinMax
-
           def arity
-            minima, maxima = map_min_max(children.map(&:arity_range)).transpose
+            minima, maxima = children.map(&:arity_range).map(&:minmax).transpose
             min = minima.min
             max = maxima.max
             min == max ? min : min..max

data/lib/rubocop/ast/node_pattern/parser.racc.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.16
+# This file is automatically generated by Racc 1.5.1
 # from Racc grammar file "".
 #
 
@@ -14,15 +14,15 @@ module RuboCop
 
 racc_action_table = [
     14,    15,    16,    21,    18,    17,    19,    10,    11,    12,
-    60,    22,    20,     4,    40,     5,    43,     6,     7,     8,
-    28,    23,    56,    50,    66,    61,    24,    51,    51,    40,
+    60,    22,    20,     4,    24,     5,    40,     6,     7,     8,
+    28,    23,    56,    50,    40,    61,    43,    66,    51,    51,
     58,    14,    15,    16,    21,    18,    17,    19,    10,    11,
     12,   nil,    22,    20,     4,   nil,     5,   nil,     6,     7,
      8,    28,    23,   nil,   nil,   -34,    14,    15,    16,    21,
     18,    17,    19,    10,    11,    12,   nil,    22,    20,     4,
    nil,     5,   nil,     6,     7,     8,     9,    23,    14,    15,
     16,    21,    18,    17,    19,    10,    11,    12,   nil,    22,
-    20,     4,   nil,     5,   nil,     6,     7,     8,     9,    23,
+    20,     4,   nil,     5,   nil,     6,     7,     8,    28,    23,
     14,    15,    16,    21,    18,    17,    19,    10,    11,    12,
    nil,    22,    20,     4,   nil,     5,   nil,     6,     7,     8,
      9,    23,    14,    15,    16,    21,    18,    17,    19,    10,
@@ -33,7 +33,7 @@ racc_action_table = [
     18,    17,    19,    10,    11,    12,   nil,    22,    20,     4,
    nil,     5,   nil,     6,     7,     8,     9,    23,    14,    15,
     16,    21,    18,    17,    19,    10,    11,    12,   nil,    22,
-    20,     4,   nil,     5,   nil,     6,     7,     8,    28,    23,
+    20,     4,   nil,     5,   nil,     6,     7,     8,     9,    23,
     14,    15,    16,    21,    18,    17,    19,    10,    11,    12,
    nil,    22,    20,     4,    44,     5,   nil,     6,     7,     8,
     28,    23,    14,    15,    16,    21,    18,    17,    19,    10,
@@ -47,31 +47,31 @@ racc_action_table = [
     20,     4,   nil,     5,   nil,     6,     7,     8,     9,    23,
     14,    15,    16,    21,    18,    17,    19,    10,    11,    12,
    nil,    22,    20,     4,   nil,     5,   nil,     6,     7,     8,
-     9,    23,    47,    48,    49,    -1,    -1,    -1,    -2,    -2,
-    -2 ]
+     9,    23,    -1,    -1,    -1,    -2,    -2,    -2,    47,    48,
+    49 ]
 
 racc_action_check = [
     42,    42,    42,    42,    42,    42,    42,    42,    42,    42,
-    54,    42,    42,    42,    11,    42,    24,    42,    42,    42,
-    42,    42,    42,    30,    62,    54,     1,    63,    30,    10,
+    54,    42,    42,    42,     1,    42,    10,    42,    42,    42,
+    42,    42,    42,    30,    11,    54,    24,    62,    30,    63,
     42,    59,    59,    59,    59,    59,    59,    59,    59,    59,
     59,   nil,    59,    59,    59,   nil,    59,   nil,    59,    59,
-    59,    59,    59,   nil,   nil,    59,     5,     5,     5,     5,
-     5,     5,     5,     5,     5,     5,   nil,     5,     5,     5,
-   nil,     5,   nil,     5,     5,     5,     5,     5,     6,     6,
-     6,     6,     6,     6,     6,     6,     6,     6,   nil,     6,
-     6,     6,   nil,     6,   nil,     6,     6,     6,     6,     6,
-     7,     7,     7,     7,     7,     7,     7,     7,     7,     7,
-   nil,     7,     7,     7,   nil,     7,   nil,     7,     7,     7,
-     7,     7,     8,     8,     8,     8,     8,     8,     8,     8,
-     8,     8,   nil,     8,     8,     8,   nil,     8,   nil,     8,
-     8,     8,     8,     8,     9,     9,     9,     9,     9,     9,
-     9,     9,     9,     9,   nil,     9,     9,     9,   nil,     9,
-   nil,     9,     9,     9,     9,     9,     0,     0,     0,     0,
+    59,    59,    59,   nil,   nil,    59,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,   nil,     0,     0,     0,
    nil,     0,   nil,     0,     0,     0,     0,     0,     4,     4,
      4,     4,     4,     4,     4,     4,     4,     4,   nil,     4,
      4,     4,   nil,     4,   nil,     4,     4,     4,     4,     4,
+     5,     5,     5,     5,     5,     5,     5,     5,     5,     5,
+   nil,     5,     5,     5,   nil,     5,   nil,     5,     5,     5,
+     5,     5,     6,     6,     6,     6,     6,     6,     6,     6,
+     6,     6,   nil,     6,     6,     6,   nil,     6,   nil,     6,
+     6,     6,     6,     6,     7,     7,     7,     7,     7,     7,
+     7,     7,     7,     7,   nil,     7,     7,     7,   nil,     7,
+   nil,     7,     7,     7,     7,     7,     8,     8,     8,     8,
+     8,     8,     8,     8,     8,     8,   nil,     8,     8,     8,
+   nil,     8,   nil,     8,     8,     8,     8,     8,     9,     9,
+     9,     9,     9,     9,     9,     9,     9,     9,   nil,     9,
+     9,     9,   nil,     9,   nil,     9,     9,     9,     9,     9,
     27,    27,    27,    27,    27,    27,    27,    27,    27,    27,
    nil,    27,    27,    27,    27,    27,   nil,    27,    27,    27,
     27,    27,    28,    28,    28,    28,    28,    28,    28,    28,
@@ -85,17 +85,17 @@ racc_action_check = [
     50,    50,   nil,    50,   nil,    50,    50,    50,    50,    50,
     61,    61,    61,    61,    61,    61,    61,    61,    61,    61,
    nil,    61,    61,    61,   nil,    61,   nil,    61,    61,    61,
-    61,    61,    29,    29,    29,    25,    25,    25,    26,    26,
-    26 ]
+    61,    61,    25,    25,    25,    26,    26,    26,    29,    29,
+    29 ]
 
 racc_action_pointer = [
-   164,    26,   nil,   nil,   186,    54,    76,    98,   120,   142,
-    17,     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    16,   318,   321,   208,   230,   315,
+    54,    14,   nil,   nil,    76,    98,   120,   142,   164,   186,
+     4,    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    26,   315,   318,   208,   230,   321,
     -2,   nil,   nil,   252,   nil,   nil,   nil,   nil,   nil,   nil,
    274,   nil,    -2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    296,   nil,   nil,   nil,    -6,   nil,   nil,   nil,   nil,    29,
-   nil,   318,    -2,    -3,   nil,   nil,   nil ]
+   nil,   318,     1,    -1,   nil,   nil,   nil ]
 
 racc_action_default = [
    -47,   -47,    -1,    -2,   -31,   -47,   -47,   -47,   -47,   -47,
@@ -107,26 +107,26 @@ racc_action_default = [
    -37,   -47,   -47,   -47,   -35,   -39,   -26 ]
 
 racc_goto_table = [
-     1,    33,    64,    32,    25,    34,    35,    36,    37,    38,
-    54,    26,    39,    41,    27,    42,    46,    63,    62,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    45,    25,    38,   nil,
-   nil,   nil,   nil,    53,    26,   nil,   nil,   nil,   nil,   nil,
-    55,    57,    25,   nil,   nil,   nil,    59,   nil,   nil,    26,
+     1,    33,    27,    25,    26,    34,    35,    36,    37,    38,
+    42,    32,    39,    41,    46,    63,    62,    64,    54,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    25,    26,    38,   nil,
+   nil,   nil,   nil,    53,    45,   nil,   nil,   nil,   nil,   nil,
+    55,    25,    26,   nil,   nil,   nil,    59,   nil,   nil,    57,
     34,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    53,
    nil,    65 ]
 
 racc_goto_check = [
-     1,     5,    13,     9,     2,     1,     1,     1,     1,     1,
-    14,     3,     6,     6,     4,     8,    10,    11,    12,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,     9,     2,     1,   nil,
-   nil,   nil,   nil,     1,     3,   nil,   nil,   nil,   nil,   nil,
-     1,     9,     2,   nil,   nil,   nil,     5,   nil,   nil,     3,
+     1,     5,     4,     2,     3,     1,     1,     1,     1,     1,
+     8,     9,     6,     6,    10,    11,    12,    13,    14,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     2,     3,     1,   nil,
+   nil,   nil,   nil,     1,     9,   nil,   nil,   nil,   nil,   nil,
+     1,     2,     3,   nil,   nil,   nil,     5,   nil,   nil,     9,
      1,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     1,
    nil,     1 ]
 
 racc_goto_pointer = [
-   nil,     0,     0,     7,    10,    -4,     2,   nil,    -8,    -1,
-   -13,   -42,   -41,   -57,   -30 ]
+   nil,     0,    -1,     0,    -2,    -4,     2,   nil,   -13,     7,
+   -15,   -44,   -43,   -42,   -22 ]
 
 racc_goto_default = [
    nil,    29,     2,     3,   nil,   nil,   nil,    13,   nil,   nil,

data/lib/rubocop/ast/processed_source.rb

@@ -41,7 +41,7 @@ module RuboCop
       def ast_with_comments
         return if !ast || !comments
 
-        @ast_with_comments ||= Parser::Source::Comment.associate(ast, comments)
+        @ast_with_comments ||= Parser::Source::Comment.associate_by_identity(ast, comments)
       end
 
       # Returns the source lines, line break characters removed, excluding a

data/lib/rubocop/ast/traversal.rb

@@ -114,9 +114,10 @@ module RuboCop
                               in_match match_alt break next
                               match_as array_pattern array_pattern_with_tail
                               hash_pattern const_pattern find_pattern
-                              index indexasgn procarg0]
+                              index indexasgn procarg0 kwargs]
       many_opt_node_children = %i[case rescue resbody ensure for when
-                                  case_match in_pattern irange erange]
+                                  case_match in_pattern irange erange
+                                  match_pattern match_pattern_p]
 
       ### Callbacks for above
       def_callback no_children

data/lib/rubocop/ast/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module AST
     module Version
-      STRING = '1.1.1'
+      STRING = '1.4.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-ast
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2021-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1.5
+        version: 3.0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1.5
+        version: 3.0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -60,10 +60,11 @@ files:
 - lib/rubocop/ast.rb
 - lib/rubocop/ast/builder.rb
 - lib/rubocop/ast/ext/range.rb
-- lib/rubocop/ast/ext/set.rb
+- lib/rubocop/ast/ext/range_min_max.rb
 - lib/rubocop/ast/node.rb
 - lib/rubocop/ast/node/alias_node.rb
 - lib/rubocop/ast/node/and_node.rb
+- lib/rubocop/ast/node/arg_node.rb
 - lib/rubocop/ast/node/args_node.rb
 - lib/rubocop/ast/node/array_node.rb
 - lib/rubocop/ast/node/block_node.rb
@@ -74,6 +75,7 @@ files:
 - lib/rubocop/ast/node/const_node.rb
 - lib/rubocop/ast/node/def_node.rb
 - lib/rubocop/ast/node/defined_node.rb
+- lib/rubocop/ast/node/dstr_node.rb
 - lib/rubocop/ast/node/ensure_node.rb
 - lib/rubocop/ast/node/float_node.rb
 - lib/rubocop/ast/node/for_node.rb
@@ -101,6 +103,7 @@ files:
 - lib/rubocop/ast/node/next_node.rb
 - lib/rubocop/ast/node/or_node.rb
 - lib/rubocop/ast/node/pair_node.rb
+- lib/rubocop/ast/node/procarg0_node.rb
 - lib/rubocop/ast/node/range_node.rb
 - lib/rubocop/ast/node/regexp_node.rb
 - lib/rubocop/ast/node/resbody_node.rb
@@ -158,14 +161,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: RuboCop tools to deal with Ruby code AST.

data/lib/rubocop/ast/ext/set.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-test = :foo
-case test
-when Set[:foo]
-  # ok, RUBY_VERSION > 2.4
-else
-  # Harmonize `Set#===`
-  class Set
-    alias === include?
-  end
-end