Skip to content

Fix nested constant resolution in lexical scopes #3255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jay23606 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix nested constant resolution in lexical scopes #3255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 lib/rbs/resolver/constant_resolver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ def load_context_constants(context)
constants_from_ancestors(BuiltinNames::Object.name, constants: consts)
end

constants_from_context(context, constants: consts) or return
constants_itself(context, constants: consts)
constants_from_context(context, constants: consts) or return

context_constants_cache[context] = consts
end
Expand Down
23 changes: 23 additions & 0 deletions test/rbs/resolver/constant_resolver_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,29 @@ class Bar
end
end

def test_reference_constant_context_prefers_nested_constant_over_scope_name
SignatureManager.new do |manager|
manager.files[Pathname("foo.rbs")] = <<EOF
module M
class C
class C
CONST: Integer
end
end
end
EOF
manager.build do |env|
builder = DefinitionBuilder.new(env: env)
resolver = Resolver::ConstantResolver.new(builder: builder)
context = [[nil, TypeName.parse("::M")], TypeName.parse("::M::C")]

constant = resolver.resolve(:C, context: context)

assert_equal "::M::C::C", constant.name.to_s
end
end
end

def test_reference_constant_nested_context
SignatureManager.new do |manager|
manager.files[Pathname("foo.rbs")] = <<EOF
Expand Down
Loading