sorbet-runtime 0.4.4561 → 0.4.4562

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 876bfc1a50262444a634745ee4365bef585f99f1
-  data.tar.gz: 883433b997f583f970769938165b1f9fe8ca7c0b
+  metadata.gz: fc0963ade0d5029ad47f82cb0f64291f79ded75f
+  data.tar.gz: b93481468f8542f1e7a4452a52a51ff5aebf95ad
 SHA512:
-  metadata.gz: 7d18a5daebc62112791fc39b5ef2af13f090e1e825275ec92014d630b5e2383bfa6db2909bdd16971437243d3c4bafb186cee19591ea7c52299ffbf727c8d7d2
-  data.tar.gz: 34833eccabb280746f89a619e7cc32e6f4ad6f773c73e85b446395233cc61a632db089538b15a2b38ac8df6b0d01a68d267ee8f6fb77becd271406d71c5f2d30
+  metadata.gz: 93a08ed35b68171fbaa9c74864b956855a7d1e3c883c0403462ae324bea31fee45b4522f3b1465b35a51c84e9a17501504c53d88509c6144a497ad530206eeeb
+  data.tar.gz: e46c1df5b7cd937505ee3d9595d97f1b7e1d236a4c215f78b62a3a66c28bd2f20e843ea33298ee8208e29d979e0568d86d255607d674e7c3f3d16950443dac08

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

@@ -188,6 +188,13 @@ module T::Private::Methods
     end
     T::Private::DeclState.current.reset!
 
+    if method_name == :method_added || method_name == :singleton_method_added
+      raise(
+        "Putting a `sig` on `#{method_name}` is not supported" +
+        " (sorbet-runtime uses this method internally to perform `sig` validation logic)"
+      )
+    end
+
     original_method = mod.instance_method(method_name)
     sig_block = lambda do
       T::Private::Methods.run_sig(hook_mod, method_name, original_method, current_declaration)
@@ -411,34 +418,30 @@ module T::Private::Methods
     end
   end
 
+  module MethodHooks
+    def method_added(name)
+      super(name)
+      ::T::Private::Methods._on_method_added(self, name, is_singleton_method: false)
+    end
+  end
+
+  module SingletonMethodHooks
+    def singleton_method_added(name)
+      super(name)
+      ::T::Private::Methods._on_method_added(self, name, is_singleton_method: true)
+    end
+  end
+
   def self.install_hooks(mod)
     return if @installed_hooks.include?(mod)
     @installed_hooks << mod
 
     if mod.singleton_class?
-      install_singleton_method_added_hook(mod)
+      mod.include(SingletonMethodHooks)
     else
-      original_method = T::Private::ClassUtils.replace_method(mod.singleton_class, :method_added) do |name|
-        T::Private::Methods._on_method_added(self, name)
-        original_method.bind(self).call(name)
-      end
-    end
-    install_singleton_method_added_hook(mod.singleton_class)
-  end
-
-  private_class_method def self.install_singleton_method_added_hook(singleton_klass)
-    attached = nil
-    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)
-      # This will be nil when this gets called for the addition of this method itself. We
-      # call it below to compensate.
-      if original_singleton_method
-        original_singleton_method.bind(self).call(name)
-      end
+      mod.extend(MethodHooks)
     end
-    # See the comment above
-    original_singleton_method.bind(attached).call(:singleton_method_added)
+    mod.extend(SingletonMethodHooks)
   end
 
   # use this directly if you don't want/need to box up the method into an object to pass to method_to_key.

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

@@ -37,7 +37,9 @@ module T::Private::Methods::CallValidation
     else
       T::Configuration.without_ruby_warnings do
         # get all the shims out of the way and put back the original method
+        T::Private::DeclState.current.skip_on_method_added = true
         mod.send(:define_method, method_sig.method_name, original_method)
+        T::Private::DeclState.current.skip_on_method_added = false
         mod.send(original_visibility, method_sig.method_name)
       end
     end

metadata

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