language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-30 23:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

better message for duplicate fields/tags

Browse source
This commit is contained in:
Folkert 2020-04-14 21:18:37 +02:00
parent 18c6c37c04
commit 7e4a1ef4bd
6 changed files with 367 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

76
compiler/can/src/annotation.rs
View file

@ -1,6 +1,6 @@
use crate::env::Env;
use crate::scope::Scope;
use roc_collections::all::{MutSet, SendMap};
use roc_collections::all::{MutMap, MutSet, SendMap};
use roc_module::ident::Ident;
use roc_module::ident::{Lowercase, TagName};
use roc_module::symbol::Symbol;
@ -292,9 +292,10 @@ fn can_annotation_help(
Record { fields, ext } => {
let mut field_types = SendMap::default();
let mut seen = MutMap::default();
for field in fields.iter() {
can_assigned_field(
let opt_field_name = can_assigned_field(
env,
&field.value,
region,
@ -305,6 +306,17 @@ fn can_annotation_help(
&mut field_types,
references,
);
if let Some(added) = opt_field_name {
if let Some(replaced_region) = seen.insert(added.clone(), field.region) {
env.problem(roc_problem::can::Problem::DuplicateRecordFieldType {
field_name: added.clone(),
field_region: field.region,
record_region: region,
replaced_region,
});
}
}
}
let ext_type = match ext {
@ -325,11 +337,10 @@ fn can_annotation_help(
}
TagUnion { tags, ext } => {
let mut tag_types = Vec::with_capacity(tags.len());
let mut seen = MutSet::default();
let mut seen = MutMap::default();
for tag in tags.iter() {
can_tag(
let opt_tag_name = can_tag(
env,
&tag.value,
region,
@ -341,15 +352,15 @@ fn can_annotation_help(
references,
);
let added = &tag_types.last().unwrap().0;
let is_new = seen.insert(added.clone());
if !is_new {
env.problem(roc_problem::can::Problem::DuplicateTag {
tag_name: added.clone(),
tag_region: tag.region,
tag_union_region: region,
});
if let Some(added) = opt_tag_name {
if let Some(replaced_region) = seen.insert(added.clone(), tag.region) {
env.problem(roc_problem::can::Problem::DuplicateTag {
tag_name: added.clone(),
tag_region: tag.region,
tag_union_region: region,
replaced_region,
});
}
}
}
@ -401,7 +412,7 @@ fn can_assigned_field<'a>(
local_aliases: &mut SendMap<Symbol, Alias>,
field_types: &mut SendMap<Lowercase, Type>,
references: &mut MutSet<Symbol>,
) {
) -> Option<Lowercase> {
use roc_parse::ast::AssignedField::*;
match field {
@ -409,25 +420,18 @@ fn can_assigned_field<'a>(
let field_type = can_annotation_help(
env,
&annotation.value,
region,
annotation.region,
scope,
var_store,
introduced_variables,
local_aliases,
references,
);
let label = Lowercase::from(field_name.value);
field_types.insert(label.clone(), field_type);
let removed = field_types.insert(label, field_type);
if removed.is_some() {
let field_region = Region::span_across(&field_name.region, &annotation.region);
env.problem(roc_problem::can::Problem::DuplicateRecordFieldType {
field_name: field_name.value.into(),
field_region,
record_region: region,
});
}
Some(label)
}
LabelOnly(loc_field_name) => {
// Interpret { a, b } as { a : a, b : b }
@ -442,7 +446,9 @@ fn can_assigned_field<'a>(
}
};
field_types.insert(field_name, field_type);
field_types.insert(field_name.clone(), field_type);
Some(field_name)
}
SpaceBefore(nested, _) | SpaceAfter(nested, _) => can_assigned_field(
env,
@ -455,7 +461,7 @@ fn can_assigned_field<'a>(
field_types,
references,
),
Malformed(_) => (),
Malformed(_) => None,
}
}
@ -471,7 +477,7 @@ fn can_tag<'a>(
local_aliases: &mut SendMap<Symbol, Alias>,
tag_types: &mut Vec<(TagName, Vec<Type>)>,
references: &mut MutSet<Symbol>,
) {
) -> Option<TagName> {
match tag {
Tag::Global { name, args } => {
let name = name.value.into();
@ -492,7 +498,10 @@ fn can_tag<'a>(
arg_types.push(ann);
}
tag_types.push((TagName::Global(name), arg_types));
let tag_name = TagName::Global(name);
tag_types.push((tag_name.clone(), arg_types));
Some(tag_name)
}
Tag::Private { name, args } => {
let ident_id = env.ident_ids.get_or_insert(&name.value.into());
@ -514,7 +523,10 @@ fn can_tag<'a>(
arg_types.push(ann);
}
tag_types.push((TagName::Private(symbol), arg_types));
let tag_name = TagName::Private(symbol);
tag_types.push((tag_name.clone(), arg_types));
Some(tag_name)
}
Tag::SpaceBefore(nested, _) | Tag::SpaceAfter(nested, _) => can_tag(
env,
@ -527,6 +539,6 @@ fn can_tag<'a>(
tag_types,
references,
),
Tag::Malformed(_) => (),
Tag::Malformed(_) => None,
}
}