sorbet-runtime 0.5.10482 → 0.5.10484

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11da160a81fa962524ac56b89430caafbd63dce3004e6be72f969e68d4ed325f
-  data.tar.gz: d7756592877242c01a10bd6196cd51fbffa4137bc953187e8e75743c4b5793f6
+  metadata.gz: 0261ceb29d9d188006f2790e6cf0a498278b8a5ad762b1a7a8cb073d934b1c8d
+  data.tar.gz: 449461ef6ec91785cf3dbfd5fdbb13ac1380f28acbb827817d103d022d6d5420
 SHA512:
-  metadata.gz: cc8ed0680a1176c3233b5d822f783d8127c576f1b5d7f873718ecd614268a662c464a5726cdc03175bedd7ad52f1b38adb35055592991754b8a6f111ba1204b7
-  data.tar.gz: 2f04a8a52da91292768ef76300a9418dcdc07a6f52a65090918c91645aa3ccf5e1b512b3489029d3179b9243d3bf27e97dc87d6225df5a0c9898b568fd9670f8
+  metadata.gz: 89f0ebffb1702107a27381bb89315c1ff88877d6a179ece0165852fda9029ad5b7b6d1554bef45cfd024ad3182479ae4111bd8d998d4a24419903189f5737ab4
+  data.tar.gz: a37894b38cb7a26517e253bab1e477925bda7196dc78cdf799d080385f8ce31cdb94e87a14f4f5dbe7e1448e794dac0cd29d263b4070e3c764b618dcbd100186

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

@@ -204,6 +204,34 @@ module T::Private::Methods
     @modules_with_final[mod.singleton_class.object_id]
   end
 
+  private_class_method def self.attr_accessor_reader?(method_name)
+    # If the method name ends with a "=", it's definitely not an attr_accessor reader
+    return false if method_name[-1] == "="
+
+    # If it was "attr_accessor" that triggered this, we should be 3 frames away from it:
+    # 3. `attr_accessor`
+    # 2. method_added hook
+    # 1. `_on_method_added`
+    # 0. `attr_accessor_reader?`
+    caller_frame = caller_locations(3, 1).first
+    return false unless caller_frame
+
+    caller_label = caller_frame.label
+    return false unless caller_label
+
+    caller_label.to_s == "attr_accessor"
+  end
+
+  private_class_method def self.declare_writer_sig_from_reader(method_name, current_declaration)
+    writer_decl = current_declaration.dup
+    # The block for the reader runs the block for the writer,
+    # but also adds the writer param with the same type as the return type.
+    writer_decl.blk = lambda do
+      instance_exec(&current_declaration.blk).params(**{method_name.to_sym => decl.returns})
+    end
+    T::Private::DeclState.current.active_declaration = writer_decl
+  end
+
   # Only public because it needs to get called below inside the replace_method blocks below.
   def self._on_method_added(hook_mod, method_name, is_singleton_method: false)
     if T::Private::DeclState.current.skip_on_method_added
@@ -229,6 +257,8 @@ module T::Private::Methods
     end
     T::Private::DeclState.current.reset!
 
+    declare_writer_sig_from_reader(method_name, current_declaration) if attr_accessor_reader?(method_name)
+
     if method_name == :method_added || method_name == :singleton_method_added
       raise(
         "Putting a `sig` on `#{method_name}` is not supported" \

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

@@ -58,12 +58,14 @@ class T::Private::Methods::Signature
     @defined_raw = defined_raw
 
     declared_param_names = raw_arg_types.keys
-    # If sig params are declared but there is a single parameter with a missing name
+    # If sig params are declared and there is a single parameter with a missing name
     # **and** the method ends with a "=", assume it is a writer method generated
-    # by attr_writer or attr_accessor
-    writer_method = declared_param_names != [nil] && parameters == [[:req]] && method_name[-1] == "="
-    # For writer methods, map the single parameter to the method name without the "=" at the end
-    parameters = [[:req, method_name[0...-1].to_sym]] if writer_method
+    # by attr_writer or attr_accessor.
+    # We fix up the parameter name in that case to be the method name without the "=".
+    if declared_param_names != [nil] && parameters == [[:req]] && method_name[-1] == "="
+      parameters = [[:req, method_name[0...-1].to_sym]]
+    end
+
     param_names = parameters.map {|_, name| name}
     missing_names = param_names - declared_param_names
     extra_names = declared_param_names - param_names

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.10482
+  version: 0.5.10484
 platform: ruby
 authors:
 - Stripe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-08 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest