sorbet-runtime 0.5.6277 → 0.5.6281

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22707230a23f48bfd62933d0a85920876e2ac38dc8b78c3306d205c8247e0c69
-  data.tar.gz: e5c3afa7f8dc8eb5dab01edd0086062c0597306ddd5a985b4ddde0da5e9c5a9f
+  metadata.gz: 63bab72b83acd7259f3cccecbde20697b8f3d9624b7b6f2375794d23160c1be3
+  data.tar.gz: 9d07bd57a49cf42ce854cec74195f388a715507ac775fcd51f014a903a095714
 SHA512:
-  metadata.gz: cd1d3b58bf2c258db84c6abffedd63c406bc4145f9484265a7ad988eb73dab15f0fb3186b880461ce810eb5cad494fd07fcca381694fc13d9826bd9711bdbd1b
-  data.tar.gz: d7ea87fcf45c0995cf0d14551ab8ad30441d6fcd43375f27e53b529b129180dd5c9a34b31db56e4994eaa8ce762fb25148fb24540f1b6a280df02e91ab77d6ee
+  metadata.gz: b5ea92da25e0cc43609c81c913cca8f9be94552b8a57f3fef35391271c8557c757e934ac20bf22ae02c57463bbf6e5db0f3bd156cc1ec72183731ed8a9bc23b5
+  data.tar.gz: 9e06a6cc349624f8f0353c3a3ee607a32e7d49b48ff73aaa4378724944eeb7209b0e9420f7371b8b4e674e58fe4ce386217ebc4bfd8b3e11117c8c53314d6a34

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.6277
+  version: 0.5.6281
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest