rubocop-ast 1.24.0 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78554cccfe256fe1f9c47816aee520d541d7cc9cc1e6da0fedc3aaa881a788c4
-  data.tar.gz: fd568b92e24931d617f4ee51153215a8ebd49bc3942cab17df4e64611b89748f
+  metadata.gz: 14c750eb97731379a218878594a598b7cceed776f13d5ff441af5db441dcc0d2
+  data.tar.gz: d89472b765082acad983ff690a465e0ad3485560d2ee9acabc7d44733c90421a
 SHA512:
-  metadata.gz: 46fb9ce602917ce32b77592da9ebfa0fc84ba5fd22c236d7afc70cd7a8bbc4b74855cdc54d69592c97cfb03977124dc400b4c4cca5b6c353af835ee69e84c529
-  data.tar.gz: 4834a36fc8d5976d0e10007be2777d7f0a395d41dd47a0668c1a03062cfd79ea4b972c70988be90e76624e26ce3757f3f18e34e6e3041eef70f0b0a20f11c2b7
+  metadata.gz: 4e78ae1a18f0f24c68bb3bdb5b60cb21c32b0eb937c137c8f17a7b7148ee7de8b4e566316cbc1c10b05e795bf3692361bbfe69b1a8e6f1dc7a77b97a6678e10a
+  data.tar.gz: 29ec502d4e4dbac037d477293255e6951c6d4081292df7efdddc18b1cec0ee1dcc812d6f03575557468274704ac828e361890103337a579ac4d10ec5cd14346d

data/lib/rubocop/ast/builder.rb

@@ -75,7 +75,7 @@ module RuboCop
         rescue:       RescueNode,
         resbody:      ResbodyNode,
         return:       ReturnNode,
-        csend:        SendNode,
+        csend:        CsendNode,
         send:         SendNode,
         str:          StrNode,
         xstr:         StrNode,

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

@@ -25,4 +25,4 @@ module RuboCop
   end
 end
 
-::Parser::Source::Range.include ::RuboCop::AST::Ext::Range
+Parser::Source::Range.include RuboCop::AST::Ext::Range

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    # A node extension for `csend` nodes. This will be used in place of a plain
+    # node when the builder constructs the AST, making its methods available
+    # to all `csend` nodes within RuboCop.
+    class CsendNode < SendNode
+      def send_type?
+        false
+      end
+    end
+  end
+end

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

@@ -36,7 +36,10 @@ module RuboCop
       #
       # @return [Array<Node>] an array of child nodes
       def child_nodes
-        each_child_node.to_a
+        # Iterate child nodes directly to avoid allocating an Enumerator.
+        nodes = []
+        each_child_node { |node| nodes << node }
+        nodes
       end
 
       # Calls the given block for each descendant node with depth first order.
@@ -102,7 +105,9 @@ module RuboCop
       protected
 
       def visit_descendants(types, &block)
-        each_child_node do |child|
+        children.each do |child|
+          next unless child.is_a?(::AST::Node)
+
           yield child if types.empty? || types.include?(child.type)
           child.visit_descendants(types, &block)
         end

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

@@ -211,7 +211,7 @@ module RuboCop
       #
       # @return [Boolean] whether this method is a lambda literal
       def lambda_literal?
-        block_literal? && loc.expression && loc.expression.source == '->'
+        loc.expression.source == '->' && block_literal?
       end
 
       # Checks whether this is a unary operation.

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

@@ -82,9 +82,17 @@ module RuboCop
       # and optimizes other calls
       module RestArguments
         include ParameterizedNode
+
+        EMPTY_ARGUMENTS = [].freeze
+
         # @return [Array<Node>] arguments, if any
         def arguments
-          children[first_argument_index..].freeze
+          if arguments?
+            children.drop(first_argument_index).freeze
+          else
+            # Skip unneeded Array allocation.
+            EMPTY_ARGUMENTS
+          end
         end
 
         # A shorthand for getting the first argument of the node.

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

@@ -15,6 +15,10 @@ module RuboCop
          (_    _    _                                                 _ ...)]
       PATTERN
 
+      def send_type?
+        true
+      end
+
       private
 
       def first_argument_index

data/lib/rubocop/ast/node.rb

@@ -84,8 +84,12 @@ module RuboCop
       LITERAL_RECURSIVE_TYPES = (OPERATOR_KEYWORDS + COMPOSITE_LITERALS + %i[begin pair]).freeze
       private_constant :LITERAL_RECURSIVE_METHODS, :LITERAL_RECURSIVE_TYPES
 
+      EMPTY_CHILDREN = [].freeze
+      EMPTY_PROPERTIES = {}.freeze
+      private_constant :EMPTY_CHILDREN, :EMPTY_PROPERTIES
+
       # @see https://www.rubydoc.info/gems/ast/AST/Node:initialize
-      def initialize(type, children = [], properties = {})
+      def initialize(type, children = EMPTY_CHILDREN, properties = EMPTY_PROPERTIES)
         @mutable_attributes = {}
 
         # ::AST::Node#initialize freezes itself.
@@ -101,11 +105,19 @@ module RuboCop
         end
       end
 
-      Parser::Meta::NODE_TYPES.each do |node_type|
+      (Parser::Meta::NODE_TYPES - [:send]).each do |node_type|
         method_name = "#{node_type.to_s.gsub(/\W/, '')}_type?"
-        define_method(method_name) do
-          type == node_type
-        end
+        class_eval <<~RUBY, __FILE__, __LINE__ + 1
+          def #{method_name}          # def block_type?
+            @type == :#{node_type}    #   @type == :block
+          end                         # end
+        RUBY
+      end
+
+      # Most nodes are of 'send' type, so this method is defined
+      # separately to make this check as fast as possible.
+      def send_type?
+        false
       end
 
       # Returns the parent node, or `nil` if the receiver is a root node.
@@ -203,9 +215,7 @@ module RuboCop
       # destructuring method.
       #
       # @return [Array<Node>] the different parts of the ndde
-      def node_parts
-        to_a
-      end
+      alias node_parts to_a
 
       # Calls the given block for each ancestor node from parent to root.
       # If no block is given, an `Enumerator` is returned.

data/lib/rubocop/ast/node_pattern.rb

@@ -54,6 +54,22 @@ module RuboCop
 
       VAR = 'node'
 
+      # Yields its argument and any descendants, depth-first.
+      #
+      def self.descend(element, &block)
+        return to_enum(__method__, element) unless block
+
+        yield element
+
+        if element.is_a?(::RuboCop::AST::Node)
+          element.children.each do |child|
+            descend(child, &block)
+          end
+        end
+
+        nil
+      end
+
       attr_reader :pattern, :ast, :match_code
 
       def_delegators :@compiler, :captures, :named_parameters, :positional_parameters
@@ -100,22 +116,6 @@ module RuboCop
         initialize(coder['pattern'])
       end
 
-      # Yields its argument and any descendants, depth-first.
-      #
-      def self.descend(element, &block)
-        return to_enum(__method__, element) unless block
-
-        yield element
-
-        if element.is_a?(::RuboCop::AST::Node)
-          element.children.each do |child|
-            descend(child, &block)
-          end
-        end
-
-        nil
-      end
-
       def freeze
         @match_code.freeze
         @compiler.freeze

data/lib/rubocop/ast/processed_source.rb

@@ -12,6 +12,9 @@ module RuboCop
       # @api private
       STRING_SOURCE_NAME = '(string)'
 
+      INVALID_LEVELS = %i[error fatal].freeze
+      private_constant :INVALID_LEVELS
+
       attr_reader :path, :buffer, :ast, :comments, :tokens, :diagnostics,
                   :parser_error, :raw_source, :ruby_version
 
@@ -20,9 +23,6 @@ module RuboCop
         new(file, ruby_version, path)
       end
 
-      INVALID_LEVELS = %i[error fatal].freeze
-      private_constant :INVALID_LEVELS
-
       def initialize(source, ruby_version, path = nil)
         # Defaults source encoding to UTF-8, regardless of the encoding it has
         # been read with, which could be non-utf8 depending on the default
@@ -265,6 +265,9 @@ module RuboCop
         when 3.2
           require 'parser/ruby32'
           Parser::Ruby32
+        when 3.3
+          require 'parser/ruby33'
+          Parser::Ruby33
         else
           raise ArgumentError,
                 "RuboCop found unknown Ruby version: #{ruby_version.inspect}"

data/lib/rubocop/ast/sexp.rb

@@ -9,7 +9,8 @@ module RuboCop
     module Sexp
       # Creates a {Node} with type `type` and children `children`.
       def s(type, *children)
-        Node.new(type, children)
+        klass = Builder::NODE_MAP[type] || Node
+        klass.new(type, children)
       end
     end
   end

data/lib/rubocop/ast/token.rb

@@ -4,6 +4,8 @@ module RuboCop
   module AST
     # A basic wrapper around Parser's tokens.
     class Token
+      LEFT_PAREN_TYPES = %i[tLPAREN tLPAREN2].freeze
+
       attr_reader :pos, :type, :text
 
       def self.from_parser_token(parser_token)
@@ -89,7 +91,7 @@ module RuboCop
       end
 
       def left_parens?
-        %i[tLPAREN tLPAREN2].include?(type)
+        LEFT_PAREN_TYPES.include?(type)
       end
 
       def right_parens?

data/lib/rubocop/ast/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module AST
     module Version
-      STRING = '1.24.0'
+      STRING = '1.25.0'
     end
   end
 end

data/lib/rubocop/ast.rb

@@ -76,6 +76,7 @@ require_relative 'ast/node/resbody_node'
 require_relative 'ast/node/return_node'
 require_relative 'ast/node/self_class_node'
 require_relative 'ast/node/send_node'
+require_relative 'ast/node/csend_node'
 require_relative 'ast/node/str_node'
 require_relative 'ast/node/dstr_node'
 require_relative 'ast/node/super_node'
@@ -91,5 +92,5 @@ require_relative 'ast/token'
 require_relative 'ast/traversal'
 require_relative 'ast/version'
 
-::RuboCop::AST::NodePattern::Parser.autoload :WithMeta, "#{__dir__}/ast/node_pattern/with_meta"
-::RuboCop::AST::NodePattern::Compiler.autoload :Debug, "#{__dir__}/ast/node_pattern/compiler/debug"
+RuboCop::AST::NodePattern::Parser.autoload :WithMeta, "#{__dir__}/ast/node_pattern/with_meta"
+RuboCop::AST::NodePattern::Compiler.autoload :Debug, "#{__dir__}/ast/node_pattern/compiler/debug"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-ast
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.25.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-30 00:00:00.000000000 Z
+date: 2023-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1.0
+        version: 3.2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1.0
+        version: 3.2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,7 @@ files:
 - lib/rubocop/ast/node/casgn_node.rb
 - lib/rubocop/ast/node/class_node.rb
 - lib/rubocop/ast/node/const_node.rb
+- lib/rubocop/ast/node/csend_node.rb
 - lib/rubocop/ast/node/def_node.rb
 - lib/rubocop/ast/node/defined_node.rb
 - lib/rubocop/ast/node/dstr_node.rb
@@ -175,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: RuboCop tools to deal with Ruby code AST.