rubocop-ast 1.40.0 → 1.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 572b1323e4358215b5e093fa0326fb04dc3d7986746143b75bd0d58223d2dc9e
-  data.tar.gz: 96d40dd742d28e480ca3be7dd7fd16bf9f410e7631373d4c441a74530bfc0314
+  metadata.gz: d19f7e10e7b8402e4cd47676b246f8ada988fe6039f45ce339f99e4aec065955
+  data.tar.gz: e877a86b9566a395e5e4d8b0656d688670c051090900cc1f753922f4f285882d
 SHA512:
-  metadata.gz: fd75e5325a907aead5239937ee34447d16da764f1fe2a31d140c9d4f5398b4c4a81c5f88a697bb62149845fc24691b53d526cc5ac05b1060472e92fceaceefae
-  data.tar.gz: d04d2d4dcf76bd6b23e9f6b2a44af18562d8bed8d9767b0511e58feabe762f90fba42f73869500fbe8c34ec1d0e4b6bebe74e7b3bbee18a83b284a97c05d477c
+  metadata.gz: 2eae7d51990b5b02aef754cb28ded1563712df934b1903439cb84f9d67d4c9507186112739a12aaaa7fb4bec33b9226f32c62ac128e21124f4d171a31ee263e3
+  data.tar.gz: d7ab2ea49e961d91b556a385e77e3bc70f67168af0af26c582bd141737c22a81f1f73d4838855baa92ddb39b2751f266d2df496d279f96c44cd66c1481d5e153

data/lib/rubocop/ast/builder.rb

@@ -32,6 +32,7 @@ module RuboCop
         gvasgn:              AsgnNode,
         block:               BlockNode,
         numblock:            BlockNode,
+        itblock:             BlockNode,
         break:               BreakNode,
         case_match:          CaseMatchNode,
         casgn:               CasgnNode,

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

@@ -11,6 +11,8 @@ module RuboCop
     class BlockNode < Node
       include MethodIdentifierPredicates
 
+      IT_BLOCK_ARGUMENT = [ArgNode.new(:arg, [:it])].freeze
+      private_constant :IT_BLOCK_ARGUMENT
       VOID_CONTEXT_METHODS = %i[each tap].freeze
       private_constant :VOID_CONTEXT_METHODS
 
@@ -46,10 +48,10 @@ module RuboCop
       #
       # @return [Array<Node>]
       def arguments
-        if numblock_type?
-          [].freeze # Numbered parameters have no block arguments.
-        else
+        if block_type?
           node_parts[1]
+        else
+          [].freeze # Numblocks and itblocks have no explicit block arguments.
         end
       end
 
@@ -60,6 +62,8 @@ module RuboCop
       def argument_list
         if numblock_type?
           numbered_arguments
+        elsif itblock_type?
+          IT_BLOCK_ARGUMENT
         else
           arguments.argument_list
         end
@@ -153,10 +157,7 @@ module RuboCop
 
       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}"])

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

@@ -6,11 +6,24 @@ module RuboCop
     # node when the builder constructs the AST, making its methods available
     # to all `ensure` nodes within RuboCop.
     class EnsureNode < Node
+      DEPRECATION_WARNING_LOCATION_CACHE = [] # rubocop:disable Style/MutableConstant
+      private_constant :DEPRECATION_WARNING_LOCATION_CACHE
+
       # Returns the body of the `ensure` clause.
       #
       # @return [Node, nil] The body of the `ensure`.
       # @deprecated Use `EnsureNode#branch`
       def body
+        first_caller = caller(1..1).first
+
+        unless DEPRECATION_WARNING_LOCATION_CACHE.include?(first_caller)
+          warn '`EnsureNode#body` is deprecated and will be changed in the next major version of ' \
+               'rubocop-ast. Use `EnsureNode#branch` instead to get the body of the `ensure` branch.'
+          warn "Called from:\n#{caller.join("\n")}\n\n"
+
+          DEPRECATION_WARNING_LOCATION_CACHE << first_caller
+        end
+
         branch
       end
 

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

@@ -39,10 +39,10 @@ module RuboCop
         end
       end
 
-      # The `block` or `numblock` node associated with this method dispatch, if any.
+      # The `block`, `numblock`, or `itblock` node associated with this method dispatch, if any.
       #
-      # @return [BlockNode, nil] the `block` or `numblock` node associated with this method
-      #                          call or `nil`
+      # @return [BlockNode, nil] the `block`, `numblock`, or `itblock` node associated with this
+      #                          method call or `nil`
       def block_node
         parent if block_literal?
       end

data/lib/rubocop/ast/node.rb

@@ -112,7 +112,8 @@ module RuboCop
         csend: :call,
 
         block: :any_block,
-        numblock: :any_block
+        numblock: :any_block,
+        itblock: :any_block
       }.freeze
       private_constant :GROUP_FOR_TYPE
 

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

@@ -109,14 +109,7 @@ module RuboCop
             private
 
             def ruby_ast(ruby)
-              buffer = ::Parser::Source::Buffer.new('(ruby)', source: ruby)
-              ruby_parser.parse(buffer)
-            end
-
-            def ruby_parser
-              require 'parser/current'
-              builder = ::RuboCop::AST::Builder.new
-              ::Parser::CurrentRuby.new(builder)
+              ProcessedSource.new(ruby, RUBY_VERSION.to_f, '(ruby)').ast
             end
           end
 

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.8.1
-# from Racc grammar file "parser.y".
+# This file is automatically generated by Racc 1.5.0
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
@@ -14,15 +14,15 @@ module RuboCop
 
 racc_action_table = [
     14,    15,    16,    21,    18,    17,    19,    10,    11,    12,
-    60,    22,    20,     4,    24,     5,    40,     6,     7,     8,
-    28,    23,    56,    50,    40,    61,    43,    66,    51,    51,
+    60,    22,    20,     4,    40,     5,    43,     6,     7,     8,
+    28,    23,    56,    50,    66,    61,    24,    51,    51,    40,
     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,    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,   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,     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,    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,    -1,    -1,    -1,    -2,    -2,    -2,    47,    48,
-    49 ]
+     9,    23,    47,    48,    49,    -1,    -1,    -1,    -2,    -2,
+    -2 ]
 
 racc_action_check = [
     42,    42,    42,    42,    42,    42,    42,    42,    42,    42,
-    54,    42,    42,    42,     1,    42,    10,    42,    42,    42,
-    42,    42,    42,    30,    11,    54,    24,    62,    30,    63,
+    54,    42,    42,    42,    11,    42,    24,    42,    42,    42,
+    42,    42,    42,    30,    62,    54,     1,    63,    30,    10,
     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,     0,     0,     0,     0,
+    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,
      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,    25,    25,    25,    26,    26,    26,    29,    29,
-    29 ]
+    61,    61,    29,    29,    29,    25,    25,    25,    26,    26,
+    26 ]
 
 racc_action_pointer = [
-    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,
+   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,
     -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,     1,    -1,   nil,   nil,   nil ]
+   nil,   318,    -2,    -3,   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,    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,
+     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,
     34,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    53,
    nil,    65 ]
 
 racc_goto_check = [
-     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,     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,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     1,
    nil,     1 ]
 
 racc_goto_pointer = [
-   nil,     0,    -1,     0,    -2,    -4,     2,   nil,   -13,     7,
-   -15,   -44,   -43,   -42,   -22 ]
+   nil,     0,     0,     7,    10,    -4,     2,   nil,    -8,    -1,
+   -13,   -42,   -41,   -57,   -30 ]
 
 racc_goto_default = [
    nil,    29,     2,     3,   nil,   nil,   nil,    13,   nil,   nil,
@@ -239,7 +239,6 @@ Racc_arg = [
   racc_shift_n,
   racc_reduce_n,
   racc_use_result_var ]
-Ractor.make_shareable(Racc_arg) if defined?(Ractor)
 
 Racc_token_to_s_table = [
   "$end",
@@ -290,7 +289,6 @@ Racc_token_to_s_table = [
   "opt_rest",
   "rest",
   "arg_list" ]
-Ractor.make_shareable(Racc_token_to_s_table) if defined?(Ractor)
 
 Racc_debug_parser = false
 

data/lib/rubocop/ast/processed_source.rb

@@ -35,25 +35,21 @@ module RuboCop
       INVALID_LEVELS = %i[error fatal].freeze
       private_constant :INVALID_LEVELS
 
-      PARSER_ENGINES = %i[parser_whitequark parser_prism].freeze
+      PARSER_ENGINES = %i[default parser_whitequark parser_prism].freeze
       private_constant :PARSER_ENGINES
 
       attr_reader :path, :buffer, :ast, :comments, :tokens, :diagnostics,
                   :parser_error, :raw_source, :ruby_version, :parser_engine
 
-      def self.from_file(path, ruby_version, parser_engine: :parser_whitequark)
+      def self.from_file(path, ruby_version, parser_engine: :default)
         file = File.read(path, mode: 'rb')
         new(file, ruby_version, path, parser_engine: parser_engine)
       end
 
       def initialize(
-        source, ruby_version, path = nil, parser_engine: :parser_whitequark, prism_result: nil
+        source, ruby_version, path = nil, parser_engine: :default, prism_result: nil
       )
-        parser_engine = parser_engine.to_sym
-        unless PARSER_ENGINES.include?(parser_engine)
-          raise ArgumentError, 'The keyword argument `parser_engine` accepts `parser_whitequark` ' \
-                               "or `parser_prism`, but `#{parser_engine}` was passed."
-        end
+        parser_engine = normalize_parser_engine(parser_engine, ruby_version)
 
         # Defaults source encoding to UTF-8, regardless of the encoding it has
         # been read with, which could be non-utf8 depending on the default
@@ -307,7 +303,8 @@ module RuboCop
             require 'parser/ruby34'
             Parser::Ruby34
           else
-            raise ArgumentError, "RuboCop found unknown Ruby version: #{ruby_version.inspect}"
+            raise ArgumentError, 'RuboCop supports target Ruby versions 3.4 and below with ' \
+                                 "`parser`. Specified target Ruby version: #{ruby_version.inspect}"
           end
         when :parser_prism
           require_prism
@@ -319,6 +316,9 @@ module RuboCop
           when 3.4
             require 'prism/translation/parser34'
             Prism::Translation::Parser34
+          when 3.5
+            require 'prism/translation/parser35'
+            Prism::Translation::Parser35
           else
             raise ArgumentError, 'RuboCop supports target Ruby versions 3.3 and above with Prism. ' \
                                  "Specified target Ruby version: #{ruby_version.inspect}"
@@ -397,6 +397,31 @@ module RuboCop
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
+      def normalize_parser_engine(parser_engine, ruby_version)
+        parser_engine = parser_engine.to_sym
+        unless PARSER_ENGINES.include?(parser_engine)
+          raise ArgumentError, 'The keyword argument `parser_engine` accepts `default`, ' \
+                               "`parser_whitequark`, or `parser_prism`, but `#{parser_engine}` " \
+                               'was passed.'
+        end
+        if parser_engine == :default
+          default_parser_engine(ruby_version)
+        else
+          parser_engine
+        end
+      end
+
+      # The Parser gem does not support Ruby 3.5 or later.
+      # It is also not fully compatible with Ruby 3.4 but for
+      # now respects using parser for backwards compatibility.
+      def default_parser_engine(ruby_version)
+        if ruby_version >= 3.5
+          :parser_prism
+        else
+          :parser_whitequark
+        end
+      end
+
       def first_token_index(range_or_node)
         begin_pos = source_range(range_or_node).begin_pos
         sorted_tokens.bsearch_index { |token| token.begin_pos >= begin_pos }

data/lib/rubocop/ast/traversal.rb

@@ -159,6 +159,7 @@ module RuboCop
       def_callback :if, :always, :nil?, :nil?
       def_callback :block, :always, :always, :nil?
       def_callback :numblock, :always, :skip, :nil?
+      def_callback :itblock, :always, :skip, :nil?
       def_callback :defs, :always, :skip, :always, :nil?
 
       def_callback %i[send csend], body: <<~RUBY
@@ -176,7 +177,7 @@ module RuboCop
 
       to_define = ::Parser::Meta::NODE_TYPES.to_a
       to_define -= defined
-      to_define -= %i[numargs ident] # transient
+      to_define -= %i[numargs itarg ident] # transient
       to_define -= %i[blockarg_expr restarg_expr] # obsolete
       to_define -= %i[objc_kwarg objc_restarg objc_varargs] # mac_ruby
       def_callback to_define, body: <<~RUBY

data/lib/rubocop/ast/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module AST
     module Version
-      STRING = '1.40.0'
+      STRING = '1.42.0'
     end
   end
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-ast
 version: !ruby/object:Gem::Version
-  version: 1.40.0
+  version: 1.42.0
 platform: ruby
 authors:
 - Bozhidar Batsov
 - Jonas Arvidsson
 - Yuji Nakayama
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-19 00:00:00.000000000 Z
+date: 2025-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -18,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.1.0
+        version: 3.3.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.1.0
+        version: 3.3.7.2
 description: "    RuboCop's Node and NodePattern classes.\n"
 email: rubocop@googlegroups.com
 executables: []
@@ -148,7 +147,6 @@ metadata:
   documentation_uri: https://docs.rubocop.org/rubocop-ast/
   bug_tracker_uri: https://github.com/rubocop/rubocop-ast/issues
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: RuboCop tools to deal with Ruby code AST.
 test_files: []