Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions lib/spoom/rbs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def method_annotations
"@final",
"@override",
"@override(allow_incompatible: true)",
"@override(allow_incompatible: :visibility)",
"@overridable",
"@without_runtime"
true
Expand Down
3 changes: 3 additions & 0 deletions lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading