rbi 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20c28ba58d5d78165f3a26c3f354d3bd32c610ebf8364b4611a3a34ec69c360d
-  data.tar.gz: f446a5d9a2ce20676a082260cdf61c016deb31940dace2fce9891b797d8c5d20
+  metadata.gz: 8945af1db330f337d9e956a588855b37d5fdeda9d9b4d14aae567205f283291e
+  data.tar.gz: 43c623a2db05aa3c7cba0da55a62717319009104e0b1f1cc2ce9b380e9c00389
 SHA512:
-  metadata.gz: 5256315c81ad44aab890dc0c35cbc996787af24a650d21ab55d6405ab8ceec99f5e108ed085418b1e3207c05d7a4c5bbfc28c95b0c4ec49bd6a95ab665b9a3e6
-  data.tar.gz: f12fc80dcf8d4804fba40343956ddefc1f6fa60aeb237a5037977375835264db312f28d5d25920f90eb07190f0379de6631811824d81a588132633e8940f843f
+  metadata.gz: a748432dd7758173966613ec2a6b067d9effb717c68a8bfcd6c2db826138892af9c4166f171546a0c78ad3ad0ef24a1e8a72b8d453b7502f4114123fb878d7b8
+  data.tar.gz: abd31c2df6e52e469b0018ac4a5b1466d9df6b670ae409fa8a9d7b642c06787e60f1439b003a7c3523fd1af2b8710100578bb2b257aa3ec6416cfeae18a1af83

data/lib/rbi/rbs_printer.rb

@@ -428,26 +428,29 @@ module RBI
         print("[#{sig.type_params.join(", ")}] ")
       end
 
-      block_param = node.params.find { |param| param.is_a?(BlockParam) }
-      sig_block_param = sig.params.find { |param| param.name == block_param&.name }
+      raise Error, "Arity mismatch between method and signature" if sig.params.size != node.params.size
 
-      sig_params = sig.params.dup
-      if block_param
-        sig_params.reject! do |param|
-          param.name == block_param.name
-        end
+      block_params, params = sig.params.zip(node.params).partition do |_sig_param, method_param|
+        method_param.is_a?(BlockParam)
       end
 
-      unless sig_params.empty?
+      raise Error, "Multiple block parameters found" if block_params.size > 1
+
+      block_param = block_params.first if block_params.any?
+
+      unless params.empty?
         print("(")
-        sig_params.each_with_index do |param, index|
+        params.each_with_index do |(sig_param, method_param), index|
           print(", ") if index > 0
-          print_sig_param(node, param)
+          print_sig_param(
+            sig_param,
+            method_param, #: as !nil
+          )
         end
         print(") ")
       end
-      if sig_block_param
-        block_type = sig_block_param.type
+      if (sig_param = block_param&.first)
+        block_type = sig_param.type
         block_type = Type.parse_string(block_type) if block_type.is_a?(String)
 
         block_is_nilable = false
@@ -490,30 +493,33 @@ module RBI
         print("[#{sig.type_params.join(", ")}] ")
       end
 
-      block_param = node.params.find { |param| param.is_a?(BlockParam) }
-      sig_block_param = sig.params.find { |param| param.name == block_param&.name }
+      raise Error, "Arity mismatch between method and signature" if sig.params.size != node.params.size
 
-      sig_params = sig.params.dup
-      if block_param
-        sig_params.reject! do |param|
-          param.name == block_param.name
-        end
+      block_params, params = sig.params.zip(node.params).partition do |_sig_param, method_param|
+        method_param.is_a?(BlockParam)
       end
 
-      unless sig_params.empty?
+      raise Error, "Multiple block parameters found" if block_params.size > 1
+
+      block_param = block_params.first if block_params.any?
+
+      unless params.empty?
         printl("(")
         indent
-        sig_params.each_with_index do |param, index|
+        params.each_with_index do |(sig_param, method_param), index|
           printt
-          print_sig_param(node, param)
-          print(",") if index < sig_params.size - 1
+          print_sig_param(
+            sig_param,
+            method_param, #: as !nil
+          )
+          print(",") if index < params.size - 1
           printn
         end
         dedent
         printt(") ")
       end
-      if sig_block_param
-        block_type = sig_block_param.type
+      if (block_param = block_param&.first)
+        block_type = block_param.type
         block_type = Type.parse_string(block_type) if block_type.is_a?(String)
 
         block_is_nilable = false
@@ -591,11 +597,8 @@ module RBI
     # @override
     #: (RestParam node) -> void
     def visit_rest_param(node)
-      if @positional_names
-        print("*untyped #{node.name}")
-      else
-        print("*untyped")
-      end
+      print("*untyped")
+      print(" #{node.name}") if @positional_names && !node.anonymous?
     end
 
     # @override
@@ -614,7 +617,7 @@ module RBI
     #: (KwRestParam node) -> void
     def visit_kw_rest_param(node)
       print("**untyped")
-      print(" #{node.name}") if node.name
+      print(" #{node.name}") unless node.anonymous?
     end
 
     # @override
@@ -873,39 +876,46 @@ module RBI
       printl("# #{loc}") if loc && print_locs
     end
 
-    #: (Method node, SigParam param) -> void
-    def print_sig_param(node, param)
-      type = parse_type(param.type).rbs_string
+    #: (SigParam sig_param, Param method_param) -> void
+    def print_sig_param(sig_param, method_param)
+      if !method_param.anonymous? && sig_param.name != method_param.name
+        raise Error,
+          "Mismatched parameter names: #{sig_param.name} vs #{method_param.name}"
+      end
 
-      orig_param = node.params.find { |p| p.name == param.name }
+      type = parse_type(sig_param.type).rbs_string
 
-      case orig_param
+      case method_param
       when ReqParam
         if @positional_names
-          print("#{type} #{param.name}")
+          print("#{type} #{sig_param.name}")
         else
           print(type)
         end
       when OptParam
         if @positional_names
-          print("?#{type} #{param.name}")
+          print("?#{type} #{sig_param.name}")
         else
           print("?#{type}")
         end
       when RestParam
-        if @positional_names
-          print("*#{type} #{param.name}")
-        else
+        if method_param.anonymous? || !@positional_names
           print("*#{type}")
+        else
+          print("*#{type} #{sig_param.name}")
         end
       when KwParam
-        print("#{param.name}: #{type}")
+        print("#{sig_param.name}: #{type}")
       when KwOptParam
-        print("?#{param.name}: #{type}")
+        print("?#{sig_param.name}: #{type}")
       when KwRestParam
-        print("**#{type} #{param.name}")
+        if method_param.anonymous?
+          print("**#{type}")
+        else
+          print("**#{type} #{sig_param.name}")
+        end
       else
-        raise Error, "Unexpected param type: #{orig_param.class} for param #{param.name}"
+        raise Error, "Unexpected param type: #{method_param.class} for param #{sig_param.name}"
       end
     end
 

data/lib/rbi/type.rb

@@ -720,7 +720,14 @@ module RBI
         if @types.empty?
           "{}"
         else
-          "{ " + @types.map { |name, type| "#{name}: #{type.to_rbi}" }.join(", ") + " }"
+          "{ " + @types.map do |name, type|
+            case name
+            when Symbol
+              "#{name}: #{type.to_rbi}"
+            when String
+              "#{name.inspect} => #{type.to_rbi}"
+            end
+          end.join(", ") + " }"
         end
       end
 

data/lib/rbi/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module RBI
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/rbi/rbi.rbi

@@ -1777,8 +1777,8 @@ class RBI::RBSPrinter < ::RBI::Visitor
   sig { params(node: ::RBI::Param, last: T::Boolean).void }
   def print_param_comment_leading_space(node, last:); end
 
-  sig { params(node: ::RBI::Method, param: ::RBI::SigParam).void }
-  def print_sig_param(node, param); end
+  sig { params(sig_param: ::RBI::SigParam, method_param: ::RBI::Param).void }
+  def print_sig_param(sig_param, method_param); end
 
   sig { params(node: ::RBI::SigParam, last: T::Boolean).void }
   def print_sig_param_comment_leading_space(node, last:); end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbi
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Alexandre Terrasa