sorbet-runtime 0.5.6274 → 0.5.6287

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78301761b82f74a342afe20b3d6eb1478d8b15aa26a1470178d57cf551df23f3
-  data.tar.gz: eceddf50388a33faaba018af4a38d272054f5887639a9c9ff3b4ac78ce1d0462
+  metadata.gz: 6a5a97f9ecd136a9941336c8871bc026409d0f3a30a66fd5dffe302fe33ed771
+  data.tar.gz: c89dff5bf909656c90b0e2073efcd539116f4fafe301a18a7b2e0ebb9baa2af8
 SHA512:
-  metadata.gz: 374a9edfce3ded25ae09cbdcbfd8576482644386e93b4e4c591ac5f8a5e19b5fd05efca165fdffd46b5de5e5de09fdb3bf5634d71f0cbf2797be61f4722be06c
-  data.tar.gz: aeb300bea46d8a199405befc3d41b1f3ec7b4286d671b8c645a24d1c0a1b3c4a4499e142577eb7dcb17171cad39ad42c567e4b52fb3fc5d2e59933e9156cec64
+  metadata.gz: 508ec9ac79c59a78eb37c15607a38c942dc3c0aa626911c0f53d4f410be3775a140c8abc1ff5fb1a548e35d01517243b5037e55a4d1483104ca08013c963c52e
+  data.tar.gz: b9c04799ab15c06ec2b8026ff90969d4f9c229a50cccac7f86f63221704c965b562c3efcdecac36480cfd008c0c422e522a2d53652b848d655c58e59b893fb4b

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

@@ -34,7 +34,7 @@ module T::Private::Methods
 
     if T::Private::DeclState.current.active_declaration
       T::Private::DeclState.current.reset!
-      raise "You called sig twice without declaring a method inbetween"
+      raise "You called sig twice without declaring a method in between"
     end
 
     if !arg.nil? && arg != :final
@@ -112,10 +112,32 @@ module T::Private::Methods
             ancestor.private_method_defined?(method_name) ||
             ancestor.protected_method_defined?(method_name)) &&
            final_method?(method_owner_and_name_to_key(ancestor, method_name))
-          raise(
-            "The method `#{method_name}` on #{ancestor} was declared as final and cannot be " +
-            (target == ancestor ? "redefined" : "overridden in #{target}")
-          )
+          definition_file, definition_line = T::Private::Methods.signature_for_method(ancestor.instance_method(method_name)).method.source_location
+          is_redefined = target == ancestor
+          caller_loc = caller_locations&.find {|l| !l.to_s.match?(%r{sorbet-runtime[^/]*/lib/}) }
+          extra_info = "\n"
+          if caller_loc
+            extra_info = (is_redefined ? "Redefined" : "Overridden") + " here: #{caller_loc.path}:#{caller_loc.lineno}\n"
+          end
+
+          error_message = "The method `#{method_name}` on #{ancestor} was declared as final and cannot be " +
+                          (is_redefined ? "redefined" : "overridden in #{target}")
+          pretty_message = "#{error_message}\n" \
+                           "Made final here: #{definition_file}:#{definition_line}\n" \
+                           "#{extra_info}"
+
+          begin
+            raise pretty_message
+          rescue => e
+            # sig_validation_error_handler raises by default; on the off chance that
+            # it doesn't raise, we need to ensure that the rest of signature building
+            # sees a consistent state.  This sig failed to validate, so we should get
+            # rid of it.  If we don't do this, errors of the form "You called sig
+            # twice without declaring a method in between" will non-deterministically
+            # crop up in tests.
+            T::Private::DeclState.current.reset!
+            T::Configuration.sig_validation_error_handler(e, {})
+          end
         end
       end
     end
@@ -152,6 +174,9 @@ module T::Private::Methods
     end
     _check_final_ancestors(mod, mod.ancestors, [method_name])
 
+    # We need to fetch the active declaration again, as _check_final_ancestors
+    # may have reset it (see the comment in that method for details).
+    current_declaration = T::Private::DeclState.current.active_declaration
     if current_declaration.nil?
       return
     end
@@ -449,6 +474,12 @@ module T::Private::Methods
       return
     end
 
+    # See https://github.com/sorbet/sorbet/pull/3964 for an explanation of why this
+    # check (which theoretically should not be needed) is actually needed.
+    if !mod.is_a?(Module)
+      return
+    end
+
     if mod.singleton_class?
       mod.include(SingletonMethodHooks)
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.6274
+  version: 0.5.6287
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest