language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-01 07:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

store `exposed_ident_ids in the scope itself

Browse source
This commit is contained in:
Folkert 2022-04-28 20:30:02 +02:00
parent 5a613db7b6
commit fb9d60226d
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
9 changed files with 54 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

32
compiler/can/src/def.rs
View file

@ -569,23 +569,19 @@ fn resolve_abilities<'a>(
let name_region = member.name.region;
let member_name = member.name.extract_spaces().item;
let member_sym = match scope.introduce(
member_name.into(),
&env.exposed_ident_ids,
&mut env.ident_ids,
name_region,
) {
Ok(sym) => sym,
Err((original_region, shadow, _new_symbol)) => {
env.problem(roc_problem::can::Problem::Shadowing {
original_region,
shadow,
kind: ShadowKind::Variable,
});
// Pretend the member isn't a part of the ability
continue;
}
};
let member_sym =
match scope.introduce(member_name.into(), &mut env.ident_ids, name_region) {
Ok(sym) => sym,
Err((original_region, shadow, _new_symbol)) => {
env.problem(roc_problem::can::Problem::Shadowing {
original_region,
shadow,
kind: ShadowKind::Variable,
});
// Pretend the member isn't a part of the ability
continue;
}
};
if pattern_type == PatternType::TopLevelDef {
env.top_level_symbols.insert(member_sym);
@ -1365,7 +1361,6 @@ fn to_pending_type_def<'a>(
match scope.introduce_without_shadow_symbol(
&Ident::from(name.value),
&env.exposed_ident_ids,
&mut env.ident_ids,
region,
) {
@ -1445,7 +1440,6 @@ fn to_pending_type_def<'a>(
} => {
let name = match scope.introduce_without_shadow_symbol(
&Ident::from(name.value),
&env.exposed_ident_ids,
&mut env.ident_ids,
name.region,
) {