sorbet-runtime 0.6.13629 → 0.6.13634

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e3cf79d8e393326c2dabc56a8d2bcc8065850fa7dcdd2a8cd3be348415ae606
-  data.tar.gz: a03250782d9b3658d1deebfe8f57c45aaf244a2bf7747eb471467e3cb608e4d2
+  metadata.gz: a38f300b9a61a2b06288ce274ba02ee8bcf13fac84309b5d2224c86180e6f5a6
+  data.tar.gz: b514881d392619bba66dd8c93653dd245d3ce191246e750d9ffe3f75469bd86e
 SHA512:
-  metadata.gz: b0d3f2382f34feff42d420bbcd61ab049bf513878cbb9e775d0de0397ddb5ac2f6d9f19c52ad9a94c386018d13718e7911e139009facc426814635170dc38319
-  data.tar.gz: 26c433f90715400ad97aff7f231d9051f269d9bce5ff6e51561a9ecce432ab7c8c64aa353d0d244462fbbefdd6d23fa357549839122854cf39b2d9edf49a0d2d
+  metadata.gz: 8eb9be0434a67481c2bb7efb97d75bf6908afeffb098a94547e7a54eceaefa8dcf1866eefa1c1cec4a8a9d6a5972997705e0d5bac0d7b4a51cfe4ec91bbd2d9c
+  data.tar.gz: d54c56982e15c1f40d0aa3fe0c64d37b447894329d8016cf901cfe8980a7422ef97cf9d3b0d74fb66e039ab9dd37e4567ff162600e58ca390fb2fa7e61f854ea

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

@@ -7,7 +7,7 @@
 class T::Private::Methods::Signature
   attr_reader :method, :method_name, :arg_types, :kwarg_types, :block_type,
               :rest_type, :keyrest_type, :bind, :effective_return_type,
-              :return_type, :req_arg_count, :req_kwarg_names, :parameters, :on_failure
+              :return_type, :req_arg_count, :req_kwarg_names, :on_failure
 
   # @flags packs, from the low bits up: mode (3 bits), check_level (2 bits),
   # override_allow_incompatible (2 bits), and defined_raw (1 bit).
@@ -58,7 +58,7 @@ class T::Private::Methods::Signature
     )
   end
 
-  def initialize(method:, method_name:, raw_arg_types:, raw_return_type:, bind:, mode:, check_level:, on_failure:, parameters: method.parameters, override_allow_incompatible: false, defined_raw: false)
+  def initialize(method:, method_name:, raw_arg_types:, raw_return_type:, bind:, mode:, check_level:, on_failure:, parameters: nil, override_allow_incompatible: false, defined_raw: false)
     check_level = check_level.nil? ? T::Private::RuntimeLevels.default_checked_level : check_level
     @method = method
     @method_name = method_name
@@ -73,6 +73,7 @@ class T::Private::Methods::Signature
     end
     @bind = NilClass.===(bind) ? bind : T::Utils.coerce(bind)
     @parameters = parameters
+    parameters ||= method.parameters
     @on_failure = on_failure
     @flags = flag_index(FLAG_MODES, mode, 'mode') |
              (flag_index(FLAG_CHECK_LEVELS, check_level, 'check_level') << CHECK_LEVEL_SHIFT) |
@@ -172,6 +173,7 @@ class T::Private::Methods::Signature
       i += 1
     end
 
+    @parameters ||= parameters unless @rest_type.nil?
     @arg_types = arg_types || EMPTY_LIST
     @kwarg_types = kwarg_types || EMPTY_HASH
     @req_arg_count = req_arg_count
@@ -188,6 +190,10 @@ class T::Private::Methods::Signature
   end
 
   # Names are derived rather than stored so that Signature fits in a smaller GC slot.
+  def parameters
+    @parameters || @method.parameters
+  end
+
   def block_name
     parameter_name(:block)
   end
@@ -312,12 +318,12 @@ class T::Private::Methods::Signature
 
   # The rest param directly follows the positional params unless required params come after it.
   private def fast_rest_name
-    param_kind, param_name = @parameters[@arg_types.length]
+    param_kind, param_name = parameters[@arg_types.length]
     param_kind == :rest ? param_name : parameter_name(:rest)
   end
 
   private def parameter_name(kind)
-    @parameters.assoc(kind)&.[](1)
+    parameters.assoc(kind)&.[](1)
   end
 
   private def flag_index(values, value, field)

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

@@ -232,7 +232,9 @@ module T::Private::Methods::SignatureValidation
       end
     end
 
-    if super_signature.block_name && !signature.block_name
+    # block_type is set exactly when the method declares a block param, and
+    # unlike block_name, reading it doesn't rebuild `method.parameters`.
+    if !super_signature.block_type.nil? && signature.block_type.nil?
       raise "Your definition of `#{method_name}` must accept a block parameter to be compatible " \
             "with the method it #{mode_verb}: " \
             "#{base_override_loc_str(signature, super_signature)}"

metadata

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