sorbet-runtime 0.6.13256 → 0.6.13258

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1169c978578eea0ccb2d0da7d75e92fbbbb18044bc6933e73e951b11f4c47c4
-  data.tar.gz: dcf7dd8578b17bf97775560d8a8316e68dadccdb4c7abff1cccff989f084f89a
+  metadata.gz: f1f96e18b171fe61567c35fd4a5dc5a12b0cd94cfb3df8855237557c4d125b24
+  data.tar.gz: cc38050090b08d0ffe16eaa41cacd8d37d500c95593ac699a46836341ea24e7f
 SHA512:
-  metadata.gz: 0ff5a3414fd326e6a3ec49edba2f0a408bae275d64801dc6864ee465e21f8d6108162ac8d515c8231267126baba08e2c502b2338ee561e2cfcb13f8e1db53460
-  data.tar.gz: 323f0f4e11f390dde2936f564c8cd82a413710c72e105467f6fda71fe2d6d589d6f266dcef2418971a6cf0ad083ed6927bdbc395e8838ec0a6680527667a7e55
+  metadata.gz: 45b877512b1af1af599c7b4d6879b35e5bc04205c8cb81a4ba8af5091992b5c86aa470d68896e73f8cfe8ed8f0f30fc22f600c25096dfbcde1dcb62572bf653c
+  data.tar.gz: a8c74b733ebb4dd5687d3fcdc1675fc42b2e2beb67c7664b5dc0bbd5027043783c3166b4687819f595a3524f777191c8d027f69eed89912baebae0223504ae41

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

@@ -246,12 +246,16 @@ class T::Private::Methods::Signature
   end
 
   def method_desc
-    loc = if (source_loc = @method.source_location)
+    self.class.method_desc(@method, @method_name)
+  end
+
+  def self.method_desc(method, method_name, source_loc=method.source_location)
+    loc = if source_loc
       source_loc.join(':')
     else
       "<unknown location>"
     end
-    "#{@method.owner}##{@method_name} at #{loc}"
+    "#{method.owner}##{method_name} at #{loc}"
   end
 
   def force_type_init

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

@@ -92,15 +92,15 @@ module T::Private::Methods::SignatureValidation
         validate_override_visibility(signature, super_signature)
       end
     else
-      validate_non_override_mode(signature)
+      validate_non_override_mode(signature.mode, signature.method_name, signature.method)
     end
   end
 
-  private_class_method def self.pretty_mode(signature)
-    if signature.mode == Modes.overridable_override
-      '.overridable.override'
+  private_class_method def self.pretty_mode(mode)
+    if mode == Modes.overridable_override
+      'overridable.override'
     else
-      ".#{signature.mode}"
+      mode
     end
   end
 
@@ -138,10 +138,10 @@ module T::Private::Methods::SignatureValidation
     end
   end
 
-  def self.validate_non_override_mode(signature)
-    case signature.mode
+  def self.validate_non_override_mode(mode, method_name, method, source_loc=method.source_location)
+    case mode
     when Modes.override
-      if signature.method_name == :each && signature.method.owner < Enumerable
+      if method_name == :each && method.owner < Enumerable
         # Enumerable#each is the only method in Sorbet's RBI payload that defines an abstract method.
         # Enumerable#each does not actually exist at runtime, but it is required to be implemented by
         # any class which includes Enumerable. We want to declare Enumerable#each as abstract so that
@@ -151,25 +151,25 @@ module T::Private::Methods::SignatureValidation
         # This is a one-off hack, and we should think carefully before adding more methods here.
         nil
       else
-        raise "You marked `#{signature.method_name}` as #{pretty_mode(signature)}, but that method doesn't already exist in this class/module to be overridden.\n" \
+        raise "You marked `#{method_name}` as #{pretty_mode(mode)}, but that method doesn't already exist in this class/module to be overridden.\n" \
           "  Either check for typos and for missing includes or super classes to make the parent method shows up\n" \
-          "  ... or remove #{pretty_mode(signature)} here: #{signature.method_desc}\n"
+          "  ... or remove #{pretty_mode(mode)} here: #{T::Private::Methods::Signature.method_desc(method, method_name, source_loc)}\n"
       end
     when Modes.standard, *Modes::NON_OVERRIDE_MODES
       # Peaceful
       nil
     else
-      raise "Unexpected mode: #{signature.mode}. Please report this bug at https://github.com/sorbet/sorbet/issues"
+      raise "Unexpected mode: #{mode}. Please report this bug at https://github.com/sorbet/sorbet/issues"
     end
 
     # Given a singleton class, we can check if it belongs to a
     # module by looking at its superclass; given `module M`,
     # `M.singleton_class.superclass == Module`, which is not true
     # for any class.
-    owner = signature.method.owner
-    if (signature.mode == Modes.abstract || Modes::OVERRIDABLE_MODES.include?(signature.mode)) &&
+    owner = method.owner
+    if (mode == Modes.abstract || Modes::OVERRIDABLE_MODES.include?(mode)) &&
         owner.singleton_class? && Class === owner && owner.superclass == Module
-      raise "Defining an overridable class method (via #{pretty_mode(signature)}) " \
+      raise "Defining an overridable class method (via #{pretty_mode(mode)}) " \
             "on a module is not allowed. Class methods on " \
             "modules do not get inherited and thus cannot be overridden."
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.6.13256
+  version: 0.6.13258
 platform: ruby
 authors:
 - Stripe