sorbet-runtime 0.5.5846 → 0.5.5848

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2027e32bbc5b1c1ebab975c09925d2adaa774f974da1548677e17b9a03b1200e
-  data.tar.gz: 5eedad40585b1044881e1322ad08c1288629cb23d47d21179ab72e8b223ba1f4
+  metadata.gz: 4e36df8a78c0d43e49da28e22b8b3a8db6094d50227f3be131ba05133b09cfd7
+  data.tar.gz: 1bfe28320c26f5749aff854bfbf9616d540a5f4d458dd35bc0e1add778a7e653
 SHA512:
-  metadata.gz: ac16088f3cc43871927eabdfcb3f01f470099ac742bfa8afb27a08ad2e6434f6a4269fcba256732d536e953214c74f749c886c687c480aaa1d176be2c3729537
-  data.tar.gz: f17f2d14faceacb434cced7f144d55c01e4b6bf42c3f62f5c995e68d2d26c1c35fd75473527384b189a120673e34b4bdb185b435cf996643ff8b26265ab6820d
+  metadata.gz: a8d0946d74e2a13eb6ffad4eb44633161da79d42b1a0e39a099a126f081e3346e6b7eecba85c50dfd333b890530a6d75bc85e7676a889fe9a1d0043198e502f6
+  data.tar.gz: 8e44416ca05dd56362fc4a36457885713dc02ac4b9367cddabfefd33f80c0ec087befd957cc2c5dd4a66361313c82a87dc4e86157415c50e1ede2851fceb2d91

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

@@ -206,22 +206,8 @@ module T::Private::Methods
     # (or unwrap back to the original method).
     new_method = nil
     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
-        # to the original pre-unwound `sig` method. I guess we'll just proxy the
-        # call forever since we don't know who is holding onto this handle to
-        # replace it.
-        new_new_method = mod.instance_method(method_name)
-        if new_method == new_new_method
-          raise "`sig` not present for method `#{method_name}` but you're trying to run it anyways. " \
-          "This should only be executed if you used `alias_method` to grab a handle to a method after `sig`ing it, but that clearly isn't what you are doing. " \
-          "Maybe look to see if an exception was thrown in your `sig` lambda or somehow else your `sig` wasn't actually applied to the method. " \
-          "Contact #dev-productivity if you're really stuck."
-        end
-        return new_new_method.bind(self).call(*args, &blk)
-      end
-
-      method_sig = T::Private::Methods.run_sig_block_for_method(new_method)
+      method_sig = T::Private::Methods.maybe_run_sig_block_for_method(new_method)
+      method_sig ||= T::Private::Methods._handle_missing_method_signature(mod, original_method, __callee__)
 
       # Should be the same logic as CallValidation.wrap_method_if_needed but we
       # don't want that extra layer of indirection in the callstack
@@ -252,6 +238,31 @@ module T::Private::Methods
     end
   end
 
+  def self._handle_missing_method_signature(mod, original_method, callee)
+    method_sig = T::Private::Methods.signature_for_method(original_method)
+    aliasing_method = mod.instance_method(callee)
+
+    if method_sig && aliasing_method != original_method && aliasing_method.original_name == original_method.name
+      # We're handling a case where `alias` or `alias_method` was called for a
+      # method which had already had a `sig` applied.
+      #
+      # Note, this logic is duplicated above, make sure to keep changes in sync.
+      if method_sig.check_level == :always || (method_sig.check_level == :tests && T::Private::RuntimeLevels.check_tests?)
+        # Checked, so copy the original signature to the aliased copy.
+        T::Private::Methods.unwrap_method(mod, method_sig, aliasing_method)
+      else
+        # Unchecked, so just make `alias_method` behave as if it had been called pre-sig.
+        mod.send(:alias_method, callee, original_method.name)
+      end
+    else
+      raise "`sig` not present for method `#{aliasing_method.name}` but you're trying to run it anyways. " \
+        "This should only be executed if you used `alias_method` to grab a handle to a method after `sig`ing it, but that clearly isn't what you are doing. " \
+        "Maybe look to see if an exception was thrown in your `sig` lambda or somehow else your `sig` wasn't actually applied to the method."
+    end
+
+    method_sig
+  end
+
   # Executes the `sig` block, and converts the resulting Declaration
   # to a Signature.
   def self.run_sig(hook_mod, method_name, original_method, declaration_block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.5846
+  version: 0.5.5848
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-25 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest