sorbet-runtime 0.4.4494 → 0.4.4496

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc2f18425d1a978318e882adfde65b3131f6f5b4
-  data.tar.gz: b27069b61f58c3fe2ce0676d89157d15963224c8
+  metadata.gz: 4659ace7366df65951a7dc57622b64c6af229a70
+  data.tar.gz: 5a357b77dbe4d7c79499d0fbb12250e0f3cfa47c
 SHA512:
-  metadata.gz: de7d056146ff86b29d97bf085e45e8026a65d69557792b90cd2374ba0ce20efadf3a72ec37e4808dd94863c600172de4b4bf8aa28264d59b0ce8b1ae40b28847
-  data.tar.gz: 7c3313b0aae49098b99ca494aef69615132e93edf3637eb565d7858af369759373678927a5cf9d9a93e3c66287a9b64c485b1be740f853ee00b7394797562ee1
+  metadata.gz: a46f6ffc23d36431df3123d90d0223c6c3d078c90855e71597595f728d392d99b29d7b7fa0d706dc5646feaf338c92a500a5a263b7e1c5b7df1114151a97328b
+  data.tar.gz: cbfd072976127bc6b258903f921906d54df75b235a8fd2180a4a86e06c16bdcec8c26d943569ab137d72a0b6d8099874d03b57d97ac384b5ce5971faac0449e0

data/lib/types/private/class_utils.rb

@@ -96,9 +96,11 @@ module T::Private::ClassUtils
 
     overwritten = original_owner == mod
     T::Configuration.without_ruby_warnings do
+      T::Private::DeclState.current.skip_on_method_added = true
       mod.send(:define_method, name, &blk) # rubocop:disable PrisonGuard/UsePublicSend
-      mod.send(original_visibility, name) # rubocop:disable PrisonGuard/UsePublicSend
+      T::Private::DeclState.current.skip_on_method_added = false
     end
+    mod.send(original_visibility, name) # rubocop:disable PrisonGuard/UsePublicSend
     new_method = mod.instance_method(name)
 
     ReplacedMethod.new(mod, original_method, new_method, overwritten, original_visibility)

data/lib/types/private/decl_state.rb

@@ -11,6 +11,7 @@ class T::Private::DeclState
   end
 
   attr_accessor :active_declaration
+  attr_accessor :skip_on_method_added
 
   def reset!
     self.active_declaration = nil

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

@@ -171,13 +171,24 @@ module T::Private::Methods
 
   # Only public because it needs to get called below inside the replace_method blocks below.
   def self._on_method_added(hook_mod, method_name, is_singleton_method: false)
+    if T::Private::DeclState.current.skip_on_method_added
+      return
+    end
+
     current_declaration = T::Private::DeclState.current.active_declaration
     mod = is_singleton_method ? hook_mod.singleton_class : hook_mod
-    original_method = mod.instance_method(method_name)
 
-    return if current_declaration.nil?
+    if T::Private::Final.final_module?(mod) && (current_declaration.nil? || !current_declaration.final)
+      raise "`#{mod.name}` was declared as final but its method `#{method_name}` was not declared as final"
+    end
+    _check_final_ancestors(mod, mod.ancestors, [method_name])
+
+    if current_declaration.nil?
+      return
+    end
     T::Private::DeclState.current.reset!
 
+    original_method = mod.instance_method(method_name)
     sig_block = lambda do
       T::Private::Methods.run_sig(hook_mod, method_name, original_method, current_declaration)
     end
@@ -187,7 +198,6 @@ module T::Private::Methods
     # This wrapper is very slow, so it will subsequently re-wrap with a much faster wrapper
     # (or unwrap back to the original method).
     new_method = nil
-    # this prevents us from running the final checks twice for every method def.
     T::Private::ClassUtils.replace_method(mod, method_name) do |*args, &blk|
       if !T::Private::Methods.has_sig_block_for_method(new_method)
         # This should only happen if the user used alias_method to grab a handle
@@ -420,8 +430,6 @@ module T::Private::Methods
 
   private_class_method def self.install_singleton_method_added_hook(singleton_klass)
     attached = nil
-    # this prevents the final checks from triggering about singleton_method_added not being a final method even if the
-    # module is final.
     original_singleton_method = T::Private::ClassUtils.replace_method(singleton_klass, :singleton_method_added) do |name|
       attached = self
       T::Private::Methods._on_method_added(self, name, is_singleton_method: true)

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

@@ -170,6 +170,7 @@ module T::Private::Methods::CallValidation
     has_simple_procedure_types = all_args_are_simple && method_sig.return_type.is_a?(T::Private::Types::Void)
 
     T::Configuration.without_ruby_warnings do
+      T::Private::DeclState.current.skip_on_method_added = true
       if has_fixed_arity && has_simple_method_types && method_sig.arg_types.length < 5 && is_allowed_to_have_fast_path
         create_validator_method_fast(mod, original_method, method_sig)
       elsif has_fixed_arity && has_simple_procedure_types && method_sig.arg_types.length < 5 && is_allowed_to_have_fast_path
@@ -177,6 +178,7 @@ module T::Private::Methods::CallValidation
       else
         create_validator_slow(mod, original_method, method_sig)
       end
+      T::Private::DeclState.current.skip_on_method_added = false
     end
     mod.send(original_visibility, method_sig.method_name)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.4.4494
+  version: 0.4.4496
 platform: ruby
 authors:
 - Stripe