Merge pull request #804 from Shopify/at-rbs-override-allow-incompatible-visibility

Add support for `override(allow_incompatible: :visibility)`

Author: Morriar

Gemfile.lock

@@ -53,7 +53,7 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.0)
-    rbi (0.3.6)
+    rbi (0.3.7)
       prism (~> 1.0)
       rbs (>= 3.4.4)
     rbs (4.0.0.dev.4)

lib/spoom/rbs.rb

@@ -43,6 +43,7 @@ def method_annotations
                "@final",
                "@override",
                "@override(allow_incompatible: true)",
+               "@override(allow_incompatible: :visibility)",
                "@overridable",
                "@without_runtime"
             true

lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb

@@ -248,6 +248,9 @@ def apply_member_annotations(annotations, sig)
             when "@override(allow_incompatible: true)"
               sig.is_override = true
               sig.allow_incompatible_override = true
+            when "@override(allow_incompatible: :visibility)"
+              sig.is_override = true
+              sig.allow_incompatible_override_visibility = true
             when "@overridable"
               sig.is_overridable = true
             when "@without_runtime"

lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb

@@ -297,6 +297,8 @@ def apply_member_annotations(sigs)
           if sigs.any? { |_, sig| sig.is_override }
             @rewriter << if sigs.any? { |_, sig| sig.allow_incompatible_override }
               Source::Insert.new(insert_pos, "# @override(allow_incompatible: true)\n#{indent}")
+            elsif sigs.any? { |_, sig| sig.allow_incompatible_override_visibility }
+              Source::Insert.new(insert_pos, "# @override(allow_incompatible: :visibility)\n#{indent}")
             else
               Source::Insert.new(insert_pos, "# @override\n#{indent}")
             end