WIP: Point RBI to main

Author: paracycle

Gemfile

@@ -13,3 +13,5 @@ group :development do
   gem "rubocop-sorbet", require: false
   gem "tapioca", require: false
 end
+
+gem "rbi", git: "https://github.com/Shopify/rbi.git", branch: "main"

Gemfile.lock

@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/Shopify/rbi.git
+  revision: 6ee489b84ea07be6e6a2f4d9533a4aaa8f8aaf4d
+  branch: main
+  specs:
+    rbi (0.3.6)
+      prism (~> 1.0)
+      rbs (>= 3.4.4)
+
 PATH
   remote: .
   specs:
@@ -53,9 +62,6 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.0)
-    rbi (0.3.6)
-      prism (~> 1.0)
-      rbs (>= 3.4.4)
     rbs (4.0.0.dev.4)
       logger
       prism (>= 1.3.0)
@@ -129,6 +135,7 @@ DEPENDENCIES
   minitest
   minitest-reporters
   rake (~> 13.3.0)
+  rbi!
   rubocop-shopify
   rubocop-sorbet
   spoom!

lib/spoom/rbs.rb

@@ -64,6 +64,7 @@ def initialize(string, location)
 
     class Annotation < Comment; end
     class Signature < Comment; end
+    class TypeAlias < Comment; end
 
     module ExtractRBSComments
       #: (Prism::Node) -> Comments

lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb

@@ -282,24 +282,58 @@ def already_extends?(node, constant_regex)
           end
         end
 
+        #: (Array[Prism::Comment]) -> Array[RBS::TypeAlias]
+        def collect_type_aliases(comments)
+          type_aliases = [] #: Array[RBS::TypeAlias]
+
+          return type_aliases if comments.empty?
+
+          continuation_comments = [] #: Array[Prism::Comment]
+
+          comments.reverse_each do |comment|
+            string = comment.slice
+
+            if string.start_with?("#:")
+              string = string.delete_prefix("#:").strip
+              location = comment.location
+
+              if string.start_with?("type ")
+                continuation_comments.reverse_each do |continuation_comment|
+                  string = "#{string}#{continuation_comment.slice.delete_prefix("#|")}"
+                  location = location.join(continuation_comment.location)
+                end
+
+                type_aliases << Spoom::RBS::TypeAlias.new(string, location)
+              end
+
+              # Clear the continuation comments regardless of whether we found a type alias or not
+              continuation_comments.clear
+            elsif string.start_with?("#|")
+              continuation_comments << comment
+            else
+              continuation_comments.clear
+            end
+          end
+
+          type_aliases
+        end
+
         #: (Array[Prism::Comment]) -> void
         def apply_type_aliases(comments)
-          comments.each do |comment|
-            string = comment.slice.strip
-            next unless string.start_with?("#: type ") && string.include?(" = ")
+          type_aliases = collect_type_aliases(comments)
 
-            # Extract the type alias content
-            type_alias_content = string.delete_prefix("#:").strip
+          type_aliases.each do |type_alias|
+            indent = " " * type_alias.location.start_column
+            insert_pos = adjust_to_line_start(type_alias.location.start_offset)
 
-            location = comment.location
-            from = adjust_to_line_start(location.start_offset)
-            to = adjust_to_line_end(location.end_offset)
+            from = insert_pos
+            to = adjust_to_line_end(type_alias.location.end_offset)
 
-            insert_pos = from
-            indent = " " * location.start_column
+            *, decls = ::RBS::Parser.parse_signature(type_alias.string)
 
-            *, decls = ::RBS::Parser.parse_signature(type_alias_content)
+            # We only expect there to be a single type alias declaration
             next unless decls.size == 1 && decls.first.is_a?(::RBS::AST::Declarations::TypeAlias)
+
             rbs_type = decls.first
             sorbet_type = RBI::RBS::TypeTranslator.translate(rbs_type.type)
 
@@ -312,7 +346,6 @@ def apply_type_aliases(comments)
             )
 
             @rewriter << Source::Delete.new(from, to)
-
             @rewriter << Source::Insert.new(insert_pos, "#{indent}#{alias_name} = T.type_alias { #{sorbet_type.to_rbi} }\n")
           rescue ::RBS::ParsingError, ::RBI::Error
             # Ignore type aliases with errors

rbi/spoom.rbi

@@ -2584,6 +2584,7 @@ module Spoom::RBS::ExtractRBSComments
 end
 
 class Spoom::RBS::Signature < ::Spoom::RBS::Comment; end
+class Spoom::RBS::TypeAlias < ::Spoom::RBS::Comment; end
 Spoom::SPOOM_PATH = T.let(T.unsafe(nil), String)
 module Spoom::Sorbet; end
 Spoom::Sorbet::BIN_PATH = T.let(T.unsafe(nil), String)

test/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs_test.rb

@@ -450,9 +450,12 @@ def test_translate_type_alias
           contents = <<~RB
             module Aliases
               #: type foo = Integer | String
+              #: type multiLine =
+              #|   Integer |
+              #|   String
             end
 
-            #: (a: Aliases::foo) -> Integer
+            #: (Aliases::foo a) -> Aliases::multiLine
             def bar(a)
               42
             end
@@ -461,9 +464,10 @@ def bar(a)
           assert_equal(<<~RB, rbs_comments_to_sorbet_sigs(contents))
             module Aliases
               Foo = T.type_alias { T.any(Integer, String) }
+              MultiLine = T.type_alias { T.any(Integer, String) }
             end
 
-            sig { params(a: Aliases::Foo).returns(Integer) }
+            sig { params(a: Aliases::Foo).returns(Aliases::MultiLine) }
             def bar(a)
               42
             end
@@ -475,7 +479,7 @@ def test_translate_type_alias_with_complex_type
             #: type Foo::user_id = Integer
             #: type ::Bar::user_data = { id: Foo::user_id, name: String }
 
-            #: (data: ::Bar::user_data) -> Foo::user_id
+            #: (::Bar::user_data data) -> Foo::user_id
             def process_user(data)
               data[:id]
             end
@@ -520,7 +524,7 @@ def test_translate_type_alias_with_generics
           contents = <<~RB
             #: type list = Array[Integer]
 
-            #: (items: list) -> list
+            #: (list items) -> list
             def double_items(items)
               items.map { |x| x * 2 }
             end
@@ -540,7 +544,7 @@ def test_translate_type_alias_with_union
           contents = <<~RB
             #: type nullable_string = String?
 
-            #: (text: nullable_string) -> String
+            #: (nullable_string text) -> String
             def ensure_string(text)
               text || ""
             end