rubocop-ast 1.42.0 → 1.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d19f7e10e7b8402e4cd47676b246f8ada988fe6039f45ce339f99e4aec065955
-  data.tar.gz: e877a86b9566a395e5e4d8b0656d688670c051090900cc1f753922f4f285882d
+  metadata.gz: 9c81addbafdef9eafbc9cff169bf71dd053d5afac7b5f60a048b4c2f03f3660a
+  data.tar.gz: cae0da568f2f9a1d29876369cc1a5158879148a3fd3d773fd73f0fe765836efa
 SHA512:
-  metadata.gz: 2eae7d51990b5b02aef754cb28ded1563712df934b1903439cb84f9d67d4c9507186112739a12aaaa7fb4bec33b9226f32c62ac128e21124f4d171a31ee263e3
-  data.tar.gz: d7ab2ea49e961d91b556a385e77e3bc70f67168af0af26c582bd141737c22a81f1f73d4838855baa92ddb39b2751f266d2df496d279f96c44cd66c1481d5e153
+  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/processed_source.rb

@@ -307,8 +307,6 @@ module RuboCop
                                  "`parser`. Specified target Ruby version: #{ruby_version.inspect}"
           end
         when :parser_prism
-          require_prism
-
           case ruby_version
           when 3.3
             require 'prism/translation/parser33'
@@ -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.
@@ -415,7 +381,7 @@ module RuboCop
       # 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
+        if ruby_version >= 3.4
           :parser_prism
         else
           :parser_whitequark

data/lib/rubocop/ast/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module AST
     module Version
-      STRING = '1.42.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.42.0
+  version: 1.44.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -9,7 +9,7 @@ authors:
 - Yuji Nakayama
 bindir: bin
 cert_chain: []
-date: 2025-03-25 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: []