Merge pull request #628 from Shopify/at-fix-rbs

Handle `final` and `allow_incompatible` annotations during RBS translation
Shopify · Jan 15, 2025 · fea721e · fea721e
2 parents 917948f + 86c07cc
commit fea721e
Show file tree

Hide file tree

Showing 24 changed files with 17,761 additions and 19,109 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -43,7 +43,7 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
-    rbi (0.2.2)
+    rbi (0.2.3)
       prism (~> 1.0)
       sorbet-runtime (>= 0.5.9204)
     rdoc (6.10.0)

diff --git a/lib/spoom/sorbet/sigs.rb b/lib/spoom/sorbet/sigs.rb
@@ -101,13 +101,22 @@ def translate_method_sig(sig, node)
             out = StringIO.new
             p = RBI::RBSPrinter.new(out: out, indent: sig.loc&.begin_column)
 
+            if node.sigs.any?(&:is_final)
+              p.printn("# @final")
+              p.printt
+            end
+
             if node.sigs.any?(&:is_abstract)
               p.printn("# @abstract")
               p.printt
             end
 
             if node.sigs.any?(&:is_override)
-              p.printn("# @override")
+              if node.sigs.any?(&:allow_incompatible_override)
+                p.printn("# @override(allow_incompatible: true)")
+              else
+                p.printn("# @override")
+              end
               p.printt
             end
 

diff --git a/sorbet/rbi/gems/[email protected] → sorbet/rbi/gems/[email protected] b/sorbet/rbi/gems/[email protected] → sorbet/rbi/gems/[email protected]
diff --git a/sorbet/rbi/gems/[email protected] → sorbet/rbi/gems/[email protected] b/sorbet/rbi/gems/[email protected] → sorbet/rbi/gems/[email protected]