Skip to content

Commit

Permalink
Resolve super type name in outer context
Browse files Browse the repository at this point in the history
  • Loading branch information
soutaro committed Dec 23, 2021
1 parent 0d8e7d5 commit eb08c1e
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
6 changes: 4 additions & 2 deletions lib/rbs/environment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ def resolve_declaration(resolver, decl, outer:, prefix:)
array.unshift(head + decl.name.to_namespace)
end

outer_context = context.drop(1)

case decl
when AST::Declarations::Class
outer_ = outer + [decl]
Expand All @@ -249,8 +251,8 @@ def resolve_declaration(resolver, decl, outer:, prefix:)
type_params: decl.type_params,
super_class: decl.super_class&.yield_self do |super_class|
AST::Declarations::Class::Super.new(
name: absolute_type_name(resolver, super_class.name, context: context),
args: super_class.args.map {|type| absolute_type(resolver, type, context: context) },
name: absolute_type_name(resolver, super_class.name, context: outer_context),
args: super_class.args.map {|type| absolute_type(resolver, type, context: outer_context) },
location: super_class.location
)
end,
Expand Down
25 changes: 25 additions & 0 deletions test/rbs/environment_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,31 @@ module ::Enumerable[A]
RBS
end

def test_absolute_type_super
env = Environment.new

decls = RBS::Parser.parse_signature(<<-RBS)
module A
class C
end
class B < C
class C
end
end
end
RBS

decls.each do |decl|
env << decl
end

env.resolve_type_names.tap do |env|
class_decl = env.class_decls[TypeName("::A::B")]
assert_equal TypeName("::A::C"), class_decl.primary.decl.super_class.name
end
end

def test_reject
env = Environment.new

Expand Down

0 comments on commit eb08c1e

Please sign in to comment.