WIP

Author: Morriar

Gemfile

@@ -5,8 +5,6 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rbi", github: "Shopify/rbi", branch: "at-rbs-printer-names"
-
 group :development do
   gem "debug"
   gem "rubocop-shopify", require: false

Gemfile.lock

@@ -1,19 +1,10 @@
-GIT
-  remote: https://github.com/Shopify/rbi.git
-  revision: e6265fd9dfb38db414d2e7eb8cd69d565933410f
-  branch: at-rbs-printer-names
-  specs:
-    rbi (0.2.4)
-      prism (~> 1.0)
-      sorbet-runtime (>= 0.5.9204)
-
 PATH
   remote: .
   specs:
     spoom (1.5.4)
       erubi (>= 1.10.0)
       prism (>= 0.28.0)
-      rbi (>= 0.2.3)
+      rbi (>= 0.2.4)
       sorbet-static-and-runtime (>= 0.5.10187)
       thor (>= 0.19.2)
 
@@ -53,6 +44,9 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
+    rbi (0.2.4)
+      prism (~> 1.0)
+      sorbet-runtime (>= 0.5.9204)
     rdoc (6.10.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
@@ -113,7 +107,6 @@ DEPENDENCIES
   minitest (~> 5.0)
   minitest-reporters
   rake (~> 13.2.1)
-  rbi!
   rubocop-shopify
   rubocop-sorbet
   spoom!

lib/spoom/cli/srb/sigs.rb

@@ -13,6 +13,7 @@ class Sigs < Thor
         desc "translate", "Translate signatures from/to RBI and RBS"
         option :from, type: :string, aliases: :f, desc: "From format", enum: ["rbi"], default: "rbi"
         option :to, type: :string, aliases: :t, desc: "To format", enum: ["rbs"], default: "rbs"
+        option :positional_names, type: :boolean, aliases: :p, desc: "Use positional names", default: true
         def translate(*paths)
           from = options[:from]
           to = options[:to]
@@ -22,7 +23,7 @@ def translate(*paths)
             "in `#{files.size}` file#{files.size == 1 ? "" : "s"}...\n\n")
 
           transformed_files = transform_files(files) do |_file, contents|
-            Spoom::Sorbet::Sigs.rbi_to_rbs(contents)
+            Spoom::Sorbet::Sigs.rbi_to_rbs(contents, positional_names: options[:positional_names])
           end
 
           say("Translated signatures in `#{transformed_files}` file#{transformed_files == 1 ? "" : "s"}.")

lib/spoom/sorbet/sigs.rb

@@ -21,8 +21,8 @@ def strip(ruby_contents)
           lines.join
         end
 
-        #: (String ruby_contents) -> String
-        def rbi_to_rbs(ruby_contents)
+        #: (String ruby_contents, positional_names: bool) -> String
+        def rbi_to_rbs(ruby_contents, positional_names: true)
           ruby_contents = ruby_contents.dup
           sigs = collect_sigs(ruby_contents)
 
@@ -36,7 +36,8 @@ def rbi_to_rbs(ruby_contents)
               sig.loc&.end_line&.pred,
               T.must(sig.loc).end_column,
             )
-            ruby_contents[start_index...end_index] = SigTranslator.translate(sig, node)
+            ruby_contents[start_index...end_index] =
+              SigTranslator.translate(sig, node, positional_names: positional_names)
           end
 
           ruby_contents
@@ -87,13 +88,13 @@ class SigTranslator
         class << self
           extend T::Sig
 
-          #: (RBI::Sig sig, (RBI::Method | RBI::Attr) node) -> String
-          def translate(sig, node)
+          #: (RBI::Sig sig, (RBI::Method | RBI::Attr) node, positional_names: bool) -> String
+          def translate(sig, node, positional_names: true)
             case node
             when RBI::Method
-              translate_method_sig(sig, node)
+              translate_method_sig(sig, node, positional_names: positional_names)
             when RBI::Attr
-              translate_attr_sig(sig, node)
+              translate_attr_sig(sig, node, positional_names: positional_names)
             end
           end
 
@@ -134,10 +135,10 @@ def translate_method_sig(sig, node, positional_names: true)
             out.string
           end
 
-          #: (RBI::Sig sig, RBI::Attr node) -> String
-          def translate_attr_sig(sig, node)
+          #: (RBI::Sig sig, RBI::Attr node, positional_names: bool) -> String
+          def translate_attr_sig(sig, node, positional_names: true)
             out = StringIO.new
-            p = RBI::RBSPrinter.new(out: out)
+            p = RBI::RBSPrinter.new(out: out, positional_names: positional_names)
             p.print_attr_sig(node, sig)
             "#: #{out.string}"
           end