Skip to content

Commit c62edeb

Browse files
authored
Merge pull request #2303 from ruby/resolution
Keep annotations during type name resolution
2 parents 6f2dd07 + e80f0e6 commit c62edeb

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

lib/rbs/environment.rb

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,8 @@ def resolve_declaration(resolver, map, decl, outer:, prefix:)
552552
name: decl.name,
553553
type: absolute_type(resolver, map, decl.type, context: nil),
554554
location: decl.location,
555-
comment: decl.comment
555+
comment: decl.comment,
556+
annotations: decl.annotations
556557
)
557558
end
558559

@@ -660,23 +661,26 @@ def resolve_declaration(resolver, map, decl, outer:, prefix:)
660661
name: decl.name.with_prefix(prefix),
661662
type: absolute_type(resolver, map, decl.type, context: context),
662663
location: decl.location,
663-
comment: decl.comment
664+
comment: decl.comment,
665+
annotations: decl.annotations
664666
)
665667

666668
when AST::Declarations::ClassAlias
667669
AST::Declarations::ClassAlias.new(
668670
new_name: decl.new_name.with_prefix(prefix),
669671
old_name: absolute_type_name(resolver, map, decl.old_name, context: context),
670672
location: decl.location,
671-
comment: decl.comment
673+
comment: decl.comment,
674+
annotations: decl.annotations
672675
)
673676

674677
when AST::Declarations::ModuleAlias
675678
AST::Declarations::ModuleAlias.new(
676679
new_name: decl.new_name.with_prefix(prefix),
677680
old_name: absolute_type_name(resolver, map, decl.old_name, context: context),
678681
location: decl.location,
679-
comment: decl.comment
682+
comment: decl.comment,
683+
annotations: decl.annotations
680684
)
681685
end
682686
end

0 commit comments

Comments
 (0)