sorbet-runtime 0.5.6262 → 0.5.6284

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 120b55b23f68b8c30bdbcf57ee7321dc146fd332cc68f61779dc28ab66994e59
-  data.tar.gz: d2521efb553ac1495ab93bdf837365026f68a3281886572e8f9c6e316d8404a4
+  metadata.gz: 6fcd72ce0fcc51b13ea9e667d240dd86696b76a588a5d1753722f8a22cc9ded2
+  data.tar.gz: 23648c896fd5c43550213fb21e357530358984f43e731bff602f5b6f2347c951
 SHA512:
-  metadata.gz: 66c4b082d3fa1d150ca1cc59bd8e5ead17ff5661c53f059630085a37b7df0d880b4305183d352495f0a2fb8dc646361c457f134083ea466f320f4c2e2aabbaea
-  data.tar.gz: 4b1765c13fb06a849456d5a848fac0623481dd158191a323deb69d19190accfc2189896d2b5a56d57ce9c42ac3cdb5f64c374931f715104ffa0ba400ebbc737e
+  metadata.gz: 22e34e2e281592145bf0e077dcc256e74927f4bd246793c95d83d07bedd0a6f998adf455ede9a1cd5521eda3accad98f44d2d59af75a5fdd8fa85f2bf3e94a3d
+  data.tar.gz: 82a0807de86e66e8c7edbfde19f4ec0a843c55a7e91ea6818cf46817d16051d109a2a56b970a892224bd774880ed615666d0c3b8354811672e09fa391b5b6dcf

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