language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 05:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Unqualified lookups return params

Browse source
This commit is contained in:
Agus Zubiaga 2024-05-09 22:54:36 -03:00
parent 9d26adb228
commit 5aebb7b570
No known key found for this signature in database
4 changed files with 50 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/compiler/can/src/expr.rs
View file

@ -1859,19 +1859,20 @@ fn canonicalize_var_lookup(
// Since module_name was empty, this is an unqualified var.
// Look it up in scope!
match scope.lookup_str(ident, region) {
Ok(symbol) => {
Ok(lookup) => {
output
.references
.insert_value_lookup(symbol, QualifiedReference::Unqualified);
.insert_value_lookup(lookup.symbol, QualifiedReference::Unqualified);
if scope.abilities_store.is_ability_member_name(symbol) {
if scope.abilities_store.is_ability_member_name(lookup.symbol) {
AbilityMember(
symbol,
// todo(agus): params for abilities?
lookup.symbol,
Some(scope.abilities_store.fresh_specialization_id()),
var_store.fresh(),
)
} else {
Var(symbol, var_store.fresh())
Var(lookup, var_store.fresh())
}
}
Err(problem) => {
@ -1884,23 +1885,20 @@ fn canonicalize_var_lookup(
// Since module_name was nonempty, this is a qualified var.
// Look it up in the env!
match env.qualified_lookup(scope, module_name, ident, region) {
Ok(lookedup_symbol) => {
Ok(lookup) => {
output
.references
.insert_value_lookup(lookedup_symbol.symbol, QualifiedReference::Qualified);
.insert_value_lookup(lookup.symbol, QualifiedReference::Qualified);
if scope
.abilities_store
.is_ability_member_name(lookedup_symbol.symbol)
{
if scope.abilities_store.is_ability_member_name(lookup.symbol) {
// todo(agus): params for abilities?
AbilityMember(
lookedup_symbol.symbol,
lookup.symbol,
Some(scope.abilities_store.fresh_specialization_id()),
var_store.fresh(),
)
} else {
Var(lookedup_symbol, var_store.fresh())
Var(lookup, var_store.fresh())
}
}
Err(problem) => {