sorbet-runtime 0.4.4472 → 0.4.4475

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8a8b4923b8931649dd95fa7f039ba848b84990d
-  data.tar.gz: e2bfc998f4b1312b920cc9232d9d99a3dff221dd
+  metadata.gz: a5727cbfa118b02720b1f3da2109beee29cf1b67
+  data.tar.gz: 0b623c19e8d55101802f76519b96b1a029f0b377
 SHA512:
-  metadata.gz: 717fc4d69f03393e336ccd00d204a750ba99cd2085214d90344b8c453a5686b313cb6ca6db787cd7e1f8faae56d8c3b210b20ec1dde90f8da32f210d1ecac9bf
-  data.tar.gz: 8208290e9829296a7e3a900991ed1f17f28f94948972668c0ad9e14c7cd000c0cd5edb230f3c2fcff8d63e22089b8f44a8b5d9c6d5803633b17e5e8e31341b6f
+  metadata.gz: 49bff1319ddf918e15f48259afd4a411583384810e4f03cad56cc2ac8a70b864f22e318faa124c402792594da7054b8e1eec7854fece8a20ae90775a47e6c9cd
+  data.tar.gz: 37a01bdeb5d6792737bf44d54e4a6135a9bd0e4f54f854bda52605e293f5ab6ad6c32d3f27e774739c32eca38e06e15c0fbcab5f4752e46a295bad075c5bb38f

data/lib/types/configuration.rb

@@ -32,14 +32,14 @@ module T::Configuration
   #   def foo; end
   # end
   # ```
-  def self.enable_final_checks_for_include_extend
-    T::Private::Methods.set_final_checks_for_include_extend(true)
+  def self.enable_final_checks_on_hooks
+    T::Private::Methods.set_final_checks_on_hooks(true)
   end
 
   # Undo the effects of a previous call to
-  # `enable_final_checks_for_include_extend`.
-  def self.reset_final_checks_for_include_extend
-    T::Private::Methods.set_final_checks_for_include_extend(false)
+  # `enable_final_checks_on_hooks`.
+  def self.reset_final_checks_on_hooks
+    T::Private::Methods.set_final_checks_on_hooks(false)
   end
 
   # Configure the default checked level for a sig with no explicit `.checked`

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

@@ -11,13 +11,18 @@ module T::Private::Methods
   # - they are done possibly before any sig block has run.
   # - they are done even if the method being defined doesn't have a sig.
   @final_methods = Set.new
-  # a module-with-final is a module for which at least one of the following is true:
+  # a non-singleton is a module for which at least one of the following is true:
   # - is declared final
   # - defines a method that is declared final
-  # - includes an module-with-final
-  # - extends an module-with-final
+  # - includes an non-singleton
+  # - extends an non-singleton
+  # a singleton is the singleton_class of a non-singleton.
+  # modules_with_final is the set of singletons and non-singletons.
   @modules_with_final = Set.new
-  @old_included_extended = nil
+  # this stores the old [included, extended] hooks for Module and inherited hook for Class that we override when
+  # enabling final checks for when those hooks are called. the 'hooks' here don't have anything to do with the 'hooks'
+  # in installed_hooks.
+  @old_hooks = nil
 
   ARG_NOT_PROVIDED = Object.new
   PROC_TYPE = Object.new
@@ -126,6 +131,9 @@ module T::Private::Methods
   # the final instance methods of target and source_method_names. so, for every m in source_method_names, check if there
   # is already a method defined on one of target_ancestors with the same name that is final.
   def self._check_final_ancestors(target, target_ancestors, source_method_names)
+    if !module_with_final?(target)
+      return
+    end
     # use reverse_each to check farther-up ancestors first, for better error messages. we could avoid this if we were on
     # the version of ruby that adds the optional argument to method_defined? that allows you to exclude ancestors.
     target_ancestors.reverse_each do |ancestor|
@@ -154,6 +162,7 @@ module T::Private::Methods
 
   def self.add_module_with_final(mod)
     @modules_with_final.add(mod)
+    @modules_with_final.add(mod.singleton_class)
   end
 
   private_class_method def self.module_with_final?(mod)
@@ -231,7 +240,9 @@ module T::Private::Methods
     @sig_wrappers[key] = sig_block
     if current_declaration.final
       add_final_method(key)
-      add_module_with_final(mod)
+      # 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.
+      add_module_with_final(hook_mod)
     end
   end
 
@@ -369,7 +380,7 @@ module T::Private::Methods
 
   # the module target is adding the methods from the module source to itself. we need to check that for all instance
   # methods M on source, M is not defined on any of target's ancestors.
-  def self._included_extended_impl(target, target_ancestors, source)
+  def self._hook_impl(target, target_ancestors, source)
     if !module_with_final?(target) && !module_with_final?(source)
       return
     end
@@ -378,24 +389,28 @@ module T::Private::Methods
     _check_final_ancestors(target, target_ancestors - source.ancestors, source.instance_methods)
   end
 
-  def self.set_final_checks_for_include_extend(enable)
-    is_enabled = @old_included_extended != nil
+  def self.set_final_checks_on_hooks(enable)
+    is_enabled = @old_hooks != nil
     if enable == is_enabled
       return
     end
     if is_enabled
-      @old_included_extended.each(&:restore)
-      @old_included_extended = nil
+      @old_hooks.each(&:restore)
+      @old_hooks = nil
     else
       old_included = T::Private::ClassUtils.replace_method(Module, :included) do |arg|
         old_included.bind(self).call(arg)
-        ::T::Private::Methods._included_extended_impl(arg, arg.ancestors, self)
+        ::T::Private::Methods._hook_impl(arg, arg.ancestors, self)
       end
       old_extended = T::Private::ClassUtils.replace_method(Module, :extended) do |arg|
         old_extended.bind(self).call(arg)
-        ::T::Private::Methods._included_extended_impl(arg, arg.singleton_class.ancestors, self)
+        ::T::Private::Methods._hook_impl(arg, arg.singleton_class.ancestors, self)
+      end
+      old_inherited = T::Private::ClassUtils.replace_method(Class, :inherited) do |arg|
+        old_inherited.bind(self).call(arg)
+        ::T::Private::Methods._hook_impl(arg, arg.ancestors, self)
       end
-      @old_included_extended = [old_included, old_extended]
+      @old_hooks = [old_included, old_extended, old_inherited]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.4.4472
+  version: 0.4.4475
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest