sorbet-runtime 0.6.13286 → 0.6.13293

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2b15b12f019d99d0883d3987d7bd205a368b8646b8c998328967023be62d8a1
-  data.tar.gz: dbed6520ccd76a2ac122f63cfee589811b4ea570d72d994b0c6e1e2391640e8e
+  metadata.gz: 694b8ac11ca3cce9ba8e377eb454d8dc7f1d25a2260d918bbddf6439df4c9e25
+  data.tar.gz: 98d704c9f50db944ae0278296a5652cdf2c708c7719216ecb9107243a74d5d23
 SHA512:
-  metadata.gz: a30b5d79bb6b5ae5dd11b6a82bdec010bb00ba90d386db70a9fa8ff191180e2a264f89243f45674a7db2d6f7c17f6856d6b32e0795cacb6717852c1e2a902c1a
-  data.tar.gz: 69d156afa66059195cbc8cf6d5aad958cfc5132959fc18842716d8df563a4f08788e24fd9a43313ba7e667f4e81c30abed3e1aa03a90ee021d267d9061df9ba3
+  metadata.gz: c951c0ea164d0ec2c5a37d8a15e76efc269ae4543a4d421ac9fc81381544fb5bbaef1821bab98f9e79cc6cf5d98269e346847ccf385e8490cdab98ce1243a41e
+  data.tar.gz: 78c378b45c098585952a9b4b6048008a259b523ebd989d237e3b683094e9414868a1fe88b0ab75653e31f2ae78fcdf4013891d0c3c2620694144e2291fb55393

data/lib/types/private/decl_state.rb

@@ -12,9 +12,17 @@ class T::Private::DeclState
 
   attr_accessor :active_declaration
   attr_accessor :skip_on_method_added
+  attr_accessor :previous_declaration
 
   def reset!
     self.active_declaration = nil
+    @previous_declaration = nil
+  end
+
+  def consume!
+    @previous_declaration = self.active_declaration
+    self.active_declaration = nil
+    @previous_declaration
   end
 
   def without_on_method_added

data/lib/types/private/methods/_methods.rb

@@ -105,12 +105,17 @@ module T::Private::Methods
   #
   # we assume that source_method_names has already been filtered to only include method
   # names that were declared final at one point.
+  #
+  # Returns a boolean indicating whether it's okay to define any of `source_method_names` in `target`
+  # (e.g. true if no final method violations)
   def self._check_final_ancestors(target, source_method_names, source)
     source_ancestors = nil
     if T::Private::IS_TYPECHECKING
       # Need to avoid a pinning error, but don't want to use runtime types in _methods.rb
       source_ancestors = T.let(nil, T.nilable(T::Array[T::Module[T.anything]]))
+      found_error = T.let(false, T::Boolean)
     end
+    found_error = false
     # use reverse_each to check farther-up ancestors first, for better error messages.
     target.ancestors.reverse_each do |ancestor|
       final_methods = @modules_with_final.fetch(ancestor, nil)
@@ -142,6 +147,8 @@ module T::Private::Methods
           next if defining_ancestor_idx && source_ancestors[defining_ancestor_idx] == ancestor
         end
 
+        found_error = true
+
         final_sig = T::Private::Methods.signature_for_method(ancestor.instance_method(method_name))
         definition_file, definition_line = final_sig&.method&.source_location
         is_redefined = target == ancestor
@@ -158,19 +165,14 @@ module T::Private::Methods
                          "#{extra_info}"
 
         begin
+          # raise + rescue to populate the backtrace
           raise pretty_message
         rescue => e
-          # sig_validation_error_handler raises by default; on the off chance that
-          # it doesn't raise, we need to ensure that the rest of signature building
-          # sees a consistent state.  This sig failed to validate, so we should get
-          # rid of it.  If we don't do this, errors of the form "You called sig
-          # twice without declaring a method in between" will non-deterministically
-          # crop up in tests.
-          T::Private::DeclState.current.reset!
           T::Configuration.sig_validation_error_handler(e, {})
         end
       end
     end
+    !found_error
   end
 
   def self.add_module_with_final_method(mod, method_name)
@@ -192,23 +194,22 @@ module T::Private::Methods
       return
     end
 
-    current_declaration = T::Private::DeclState.current.active_declaration
+    current_declaration = T::Private::DeclState.current.consume!
 
     if T::Private::Final.final_module?(mod) && (current_declaration.nil? || !current_declaration.final)
       raise "#{mod} was declared as final but its method `#{method_name}` was not declared as final"
     end
     # Don't compute mod.ancestors if we don't need to bother checking final-ness.
-    if @was_ever_final_names.include?(method_name) && @modules_with_final.include?(mod)
-      _check_final_ancestors(mod, [method_name], nil)
-      # We need to fetch the active declaration again, as _check_final_ancestors
-      # may have reset it (see the comment in that method for details).
-      current_declaration = T::Private::DeclState.current.active_declaration
+    if @was_ever_final_names.include?(method_name) && @modules_with_final.include?(mod) &&
+       !_check_final_ancestors(mod, [method_name], nil)
+      # We want to pretend like the method did not have a sig, so return.
+      # (This code is not dead, because some `sig_validation_error_handler`'s do not raise.)
+      return
     end
 
     if current_declaration.nil?
       return
     end
-    T::Private::DeclState.current.reset!
 
     if method_name == :method_added || method_name == :singleton_method_added
       raise(
@@ -471,12 +472,22 @@ module T::Private::Methods
   end
 
   def self.run_all_sig_blocks(force_type_init: true)
+    current_declaration = T::Private::DeclState.current.active_declaration
+    if !current_declaration.nil?
+      T::Private::DeclState.current.reset!
+      raise "Cannot call `run_all_sig_blocks` while there is a pending `sig` block in #{current_declaration.mod} at #{current_declaration.loc}"
+    end
+
     loop do
       first_wrapper = @sig_wrappers.first
       break unless first_wrapper
       key, = first_wrapper
       run_sig_block_for_key(key, force_type_init: force_type_init)
     end
+
+    # Make sure that there are no lingering declaration blocks being kept alive
+    # (so we're not retaining any extra references for a possible GC)
+    T::Private::DeclState.current.reset!
   end
 
   def self.all_checked_tests_sigs
@@ -507,6 +518,7 @@ module T::Private::Methods
     end
 
     _check_final_ancestors(target, methods, source)
+    nil
   end
 
   def self.set_final_checks_on_hooks(enable)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.6.13286
+  version: 0.6.13293
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-06-06 00:00:00.000000000 Z
+date: 2026-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark