sorbet-runtime 0.5.6466 → 0.5.6479

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 055fc4a0be86ea7e7d8c7c9b8695a57ed61fb1236aaab5929fffa2405fce87d9
-  data.tar.gz: a040aa075c888c5cc627ada55f0358bd59da7a7b755049090abafa633d8b16e0
+  metadata.gz: 32d01a68ba67b1c6236b4d8e04cbca7937e3dfc9e413b71d12e95df2a66f2fcb
+  data.tar.gz: 612f745d5c3c547aac1ab0c4b14f4f0f050402b7b1bd2aef4994d687396d4a56
 SHA512:
-  metadata.gz: 84b4c815d669f3d2f9abf06b8452539a2759b58ae674d7e1092c32e9ccf08817aee16ff049354eb6006108f4da6129ee8c6c0af608629386a521f6c870801017
-  data.tar.gz: 91761e385c79ebe3dfd14cbd76d9e4b204fef9587127c730c130a8fde705523c4475c06d531c9f6b0d3279a3ee1236f6c531f9651594479b48e409c182980a1c
+  metadata.gz: 2839c3841676ac7639bf276cd6a52f074a8d19dccd2b8b51290210e689c33c78f6db094d9bc52c177864559fee22858bc389f7cd8961b60dd133083a14b2b24f
+  data.tar.gz: e33e3b5bd8b1901e666e969ddb18a85795dbd8c7ccf4b4db2939bbd553bd18e9a63597879b4284c88ce6d9857a5fee7a50741ee1aa7046c2eec1b5aeda7d3ff1

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

@@ -26,14 +26,23 @@ module T::Private::Methods
   # in installed_hooks.
   @old_hooks = nil
 
-  @declaring_final_method = false
-
   ARG_NOT_PROVIDED = Object.new
   PROC_TYPE = Object.new
 
-  DeclarationBlock = Struct.new(:mod, :loc, :blk, :final)
+  DeclarationBlock = Struct.new(:mod, :loc, :blk, :final, :raw)
+
+  def self.declare_sig(mod, loc, arg, &blk)
+    T::Private::DeclState.current.active_declaration = _declare_sig_internal(mod, loc, arg, &blk)
+
+    nil
+  end
 
-  def self.declare_sig(mod, arg, &blk)
+  # See tests for how to use this.  But you shouldn't be using this.
+  def self._declare_sig(mod, arg=nil, &blk)
+    _declare_sig_internal(mod, caller_locations(1, 1).first, arg, raw: true, &blk)
+  end
+
+  private_class_method def self._declare_sig_internal(mod, loc, arg, raw: false, &blk)
     install_hooks(mod)
 
     if T::Private::DeclState.current.active_declaration
@@ -45,15 +54,26 @@ module T::Private::Methods
       raise "Invalid argument to `sig`: #{arg}"
     end
 
-    loc = caller_locations(2, 1).first
-
-    T::Private::DeclState.current.active_declaration = DeclarationBlock.new(mod, loc, blk, arg == :final)
+    DeclarationBlock.new(mod, loc, blk, arg == :final, raw)
+  end
 
-    nil
+  def self._with_declared_signature(mod, declblock, &blk)
+    # If declblock is provided, this code is equivalent to the check in
+    # _declare_sig_internal, above.
+    # If declblock is not provided and we have an active declaration, we are
+    # obviously doing something wrong.
+    if T::Private::DeclState.current.active_declaration
+      T::Private::DeclState.current.reset!
+      raise "You called sig twice without declaring a method in between"
+    end
+    if declblock
+      T::Private::DeclState.current.active_declaration = declblock
+    end
+    mod.module_exec(&blk)
   end
 
   def self.start_proc
-    DeclBuilder.new(PROC_TYPE)
+    DeclBuilder.new(PROC_TYPE, false)
   end
 
   def self.finalize_proc(decl)
@@ -182,17 +202,6 @@ module T::Private::Methods
     @modules_with_final[mod.singleton_class]
   end
 
-  # See tests for how to use this.
-  def self._with_declaring_final_method_INTERNAL(&blk)
-    begin
-      prev_value = @declaring_final_method
-      @declaring_final_method = true
-      yield
-    ensure
-      @declaring_final_method = prev_value
-    end
-  end
-
   # 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
@@ -202,9 +211,7 @@ module T::Private::Methods
     current_declaration = T::Private::DeclState.current.active_declaration
     mod = is_singleton_method ? hook_mod.singleton_class : hook_mod
 
-    directly_declaring_final_method = @declaring_final_method
-    method_is_final = directly_declaring_final_method || current_declaration&.final
-    if T::Private::Final.final_module?(mod) && !method_is_final
+    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.
@@ -227,17 +234,17 @@ module T::Private::Methods
       )
     end
 
-    unless directly_declaring_final_method
-      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
+    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
 
-      # Always replace the original method with this wrapper,
-      # which is called only on the *first* invocation.
-      # This wrapper is very slow, so it will subsequently re-wrap with a much faster wrapper
-      # (or unwrap back to the original method).
-      key = method_owner_and_name_to_key(mod, method_name)
+    # Always replace the original method with this wrapper,
+    # which is called only on the *first* invocation.
+    # This wrapper is very slow, so it will subsequently re-wrap with a much faster wrapper
+    # (or unwrap back to the original method).
+    key = method_owner_and_name_to_key(mod, method_name)
+    unless current_declaration.raw
       T::Private::ClassUtils.replace_method(mod, method_name) do |*args, &blk|
         method_sig = T::Private::Methods.maybe_run_sig_block_for_key(key)
         method_sig ||= T::Private::Methods._handle_missing_method_signature(
@@ -265,11 +272,10 @@ module T::Private::Methods
           original_method.bind(self).call(*args, &blk)
         end
       end
-
-      @sig_wrappers[key] = sig_block
     end
 
-    if method_is_final
+    @sig_wrappers[key] = sig_block
+    if current_declaration.final
       @was_ever_final_names.add(method_name)
       # use hook_mod, not mod, because for example, we want class C to be marked as having final if we def C.foo as
       # final. change this to mod to see some final_method tests fail.
@@ -338,7 +344,7 @@ module T::Private::Methods
   end
 
   def self.run_builder(declaration_block)
-    builder = DeclBuilder.new(declaration_block.mod)
+    builder = DeclBuilder.new(declaration_block.mod, declaration_block.raw)
     builder
       .instance_exec(&declaration_block.blk)
       .finalize!
@@ -369,6 +375,7 @@ module T::Private::Methods
         check_level: current_declaration.checked,
         on_failure: current_declaration.on_failure,
         override_allow_incompatible: current_declaration.override_allow_incompatible,
+        defined_raw: current_declaration.raw,
       )
 
       SignatureValidation.validate(signature)

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

@@ -27,6 +27,8 @@ module T::Private::Methods::CallValidation
           )
         end
       end
+    # Do nothing in this case; this method was not wrapped in _on_method_added.
+    elsif method_sig.defined_raw
     # Note, this logic is duplicated (intentionally, for micro-perf) at `Methods._on_method_added`,
     # make sure to keep changes in sync.
     # This is a trapdoor point for each method:

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

@@ -2,7 +2,7 @@
 # typed: true
 
 module T::Private::Methods
-  Declaration = Struct.new(:mod, :params, :returns, :bind, :mode, :checked, :finalized, :on_failure, :override_allow_incompatible, :type_parameters)
+  Declaration = Struct.new(:mod, :params, :returns, :bind, :mode, :checked, :finalized, :on_failure, :override_allow_incompatible, :type_parameters, :raw)
 
   class DeclBuilder
     attr_reader :decl
@@ -15,7 +15,7 @@ module T::Private::Methods
       end
     end
 
-    def initialize(mod)
+    def initialize(mod, raw)
       # TODO RUBYPLAT-1278 - with ruby 2.5, use kwargs here
       @decl = Declaration.new(
         mod,
@@ -28,6 +28,7 @@ module T::Private::Methods
         ARG_NOT_PROVIDED, # on_failure
         nil, # override_allow_incompatible
         ARG_NOT_PROVIDED, # type_parameters
+        raw
       )
     end
 

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

@@ -5,7 +5,8 @@ class T::Private::Methods::Signature
   attr_reader :method, :method_name, :arg_types, :kwarg_types, :block_type, :block_name,
               :rest_type, :rest_name, :keyrest_type, :keyrest_name, :bind,
               :return_type, :mode, :req_arg_count, :req_kwarg_names, :has_rest, :has_keyrest,
-              :check_level, :parameters, :on_failure, :override_allow_incompatible
+              :check_level, :parameters, :on_failure, :override_allow_incompatible,
+              :defined_raw
 
   def self.new_untyped(method:, mode: T::Private::Methods::Modes.untyped, parameters: method.parameters)
     # Using `Untyped` ensures we'll get an error if we ever try validation on these.
@@ -32,7 +33,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)
+  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)
     @method = method
     @method_name = method_name
     @arg_types = []
@@ -54,6 +55,7 @@ class T::Private::Methods::Signature
     @parameters = parameters
     @on_failure = on_failure
     @override_allow_incompatible = override_allow_incompatible
+    @defined_raw = defined_raw
 
     declared_param_names = raw_arg_types.keys
     # If sig params are declared but there is a single parameter with a missing name

data/lib/types/sig.rb

@@ -25,6 +25,6 @@ module T::Sig
   # {T::Helpers}
   T::Sig::WithoutRuntime.sig {params(arg0: T.nilable(Symbol), blk: T.proc.bind(T::Private::Methods::DeclBuilder).void).void}
   def sig(arg0=nil, &blk)
-    T::Private::Methods.declare_sig(self, arg0, &blk)
+    T::Private::Methods.declare_sig(self, Kernel.caller_locations(1, 1)&.first, arg0, &blk)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.6466
+  version: 0.5.6479
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest