rubocop-ast 1.41.0 → 1.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19ee463e3a3cb36f4cac11ef8a15c891d15ab7a7b616cab272bcef1e5d1511ad
-  data.tar.gz: d01d708fe51840b874ac59409db40e12860f04d639159606633bcaf31b73a22a
+  metadata.gz: 9c81addbafdef9eafbc9cff169bf71dd053d5afac7b5f60a048b4c2f03f3660a
+  data.tar.gz: cae0da568f2f9a1d29876369cc1a5158879148a3fd3d773fd73f0fe765836efa
 SHA512:
-  metadata.gz: 3172e1d4d9ec2d01a910ef63dbb2593b8c685936e9399ecc6d701cbb808969f25eadf6a7b46bce1993202693c03c11b9bc724be0c2c0e4018213a96ffc41e3b0
-  data.tar.gz: 33871fb889a66acdc8c39c7007f3b829cd2158f3a3c6cc111a924f1350bb1b0bcafa17de4e2c4216f0065449455b29cbec12fa3483cea9eb5623301a9060219e
+  metadata.gz: 5a05ff6ffe86fc1fe0376f541f48df20d6f6df15bf0236757358f9c1c7b8231feff8efc6bd9b6aaff5f44c5eee8787c5540cde7ec14a85f346e832cc41ebe079
+  data.tar.gz: f02aba449bf7a41ad37dbd4b6efb0781555a908e3cba6459c2f88f182f36e9385ef13747e9af94740ad7c6d46d27ab5bf635231baedaa711a704a3f7ff8e8d52

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

@@ -200,8 +200,7 @@ module RuboCop
         arg = node.children[2]
 
         return unless node.send_type? && node.receiver.nil? && arg.is_a?(::AST::Node)
-
-        return arg if arg.type?(:def, :defs)
+        return arg if arg.any_def_type?
 
         def_modifier(arg)
       end
@@ -271,7 +270,7 @@ module RuboCop
 
       # @!method adjacent_def_modifier?(node = self)
       def_node_matcher :adjacent_def_modifier?, <<~PATTERN
-        (send nil? _ ({def defs} ...))
+        (send nil? _ (any_def ...))
       PATTERN
 
       # @!method bare_access_modifier_declaration?(node = self)

data/lib/rubocop/ast/node.rb

@@ -87,6 +87,9 @@ module RuboCop
 
       # @api private
       GROUP_FOR_TYPE = {
+        def: :any_def,
+        defs: :any_def,
+
         arg: :argument,
         optarg: :argument,
         restarg: :argument,
@@ -513,6 +516,10 @@ module RuboCop
         parent&.send_type? && parent.arguments.include?(self)
       end
 
+      def any_def_type?
+        GROUP_FOR_TYPE[type] == :any_def
+      end
+
       def argument_type?
         GROUP_FOR_TYPE[type] == :argument
       end

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/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,11 +303,10 @@ 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
-
           case ruby_version
           when 3.3
             require 'prism/translation/parser33'
@@ -319,6 +314,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}"
@@ -331,49 +329,17 @@ module RuboCop
         when :parser_whitequark
           RuboCop::AST::Builder
         when :parser_prism
-          require_prism
-          require_relative 'builder_prism'
           RuboCop::AST::BuilderPrism
         end
       end
 
-      # Prism is a native extension, a `LoadError` will be raised if linked to an incompatible
-      # Ruby version. Only raise if it really was caused by Prism not being present.
-      # rubocop:disable Metrics/MethodLength
-      def require_prism
-        require 'prism'
-        required_prism_version = '1.4.0'
-        if required_prism_version > Prism::VERSION
-          # While Prism is not yet a dependency, users may run with outdated versions that
-          # don't have all the parsers.
-          warn <<~MESSAGE
-            Error: Prism version #{Prism::VERSION} was loaded, but rubocop-ast requires #{required_prism_version}.
-            * If you're using Bundler and don't yet have `gem 'prism'` as a dependency, add it now.
-            * If you're using Bundler and already have `gem 'prism'` as a dependency, update it to the most recent version.
-            * If you don't use Bundler, run `gem update prism`.
-          MESSAGE
-          exit!
-        end
-      rescue LoadError => e
-        raise unless e.path == 'prism'
-
-        warn "Error: Unable to load Prism. Add `gem 'prism'` to your Gemfile."
-        exit!
-      end
-      # rubocop:enable Metrics/MethodLength
-
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def create_parser(ruby_version, parser_engine, prism_result)
         builder = builder_class(parser_engine).new
 
         parser_class = parser_class(ruby_version, parser_engine)
 
-        # NOTE: Check if the `Prism#initialize` method has the `:parser` keyword argument.
-        # The `:parser` keyword argument cannot be used to switch parsers because older versions of
-        # Prism do not support it.
-        parser_switch_available = parser_class.instance_method(:initialize).parameters.assoc(:key)
-
-        parser_instance = if prism_result && parser_switch_available
+        parser_instance = if prism_result
                             # NOTE: Since it is intended for use with Ruby LSP, it targets only Prism.
                             # If there is no reuse of a pre-parsed result, such as in Ruby LSP,
                             # regular parsing with Prism occurs, and `else` branch will be executed.
@@ -397,6 +363,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.4
+          :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/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module AST
     module Version
-      STRING = '1.41.0'
+      STRING = '1.44.0'
     end
   end
 end

data/lib/rubocop/ast.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'parser'
+require 'prism'
 require 'forwardable'
 require 'set'
 
@@ -92,6 +93,7 @@ require_relative 'ast/node/when_node'
 require_relative 'ast/node/while_node'
 require_relative 'ast/node/yield_node'
 require_relative 'ast/builder'
+require_relative 'ast/builder_prism'
 require_relative 'ast/processed_source'
 require_relative 'ast/rubocop_compatibility'
 require_relative 'ast/token'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-ast
 version: !ruby/object:Gem::Version
-  version: 1.41.0
+  version: 1.44.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -9,7 +9,7 @@ authors:
 - Yuji Nakayama
 bindir: bin
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 2025-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.7.2
+- !ruby/object:Gem::Dependency
+  name: prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: "    RuboCop's Node and NodePattern classes.\n"
 email: rubocop@googlegroups.com
 executables: []