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

fix bugs exposed by reporting tests

Browse source
This commit is contained in:
Folkert 2020-10-30 22:15:28 +01:00
parent 5017a456be
commit 40bf9be1e2
3 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -187,6 +187,16 @@ fn can_annotation_help(
let mut substitutions = ImMap::default();
let mut vars = Vec::new();
if alias.vars.len() != args.len() {
let error = Type::Erroneous(Problem::BadTypeArguments {
symbol,
region,
alias_needs: alias.vars.len() as u8,
type_got: args.len() as u8,
});
return error;
}
for (loc_var, arg_ann) in alias.vars.iter().zip(args.into_iter()) {
let name = loc_var.value.0.clone();
let var = loc_var.value.1;

9
compiler/reporting/tests/test_reporting.rs
View file

@ -2574,6 +2574,7 @@ mod test_reporting {
}
#[test]
#[ignore]
fn cyclic_alias() {
report_problem_as(
indoc!(
@ -3089,9 +3090,6 @@ mod test_reporting {
#[test]
fn two_different_cons() {
// TODO investigate what is happening here;
// while it makes some kind of sense to print the recursion var as infinite,
// it's not very helpful in practice.
report_problem_as(
indoc!(
r#"
@ -3115,17 +3113,18 @@ mod test_reporting {
This `Cons` global tag application has the type:
[ Cons {} [ Cons Str [ Cons {} ∞, Nil ] as ∞, Nil ], Nil ]
[ Cons {} [ Cons Str [ Cons {} a, Nil ] as a, Nil ], Nil ]
But the type annotation on `x` says it should be:
[ Cons {} ∞, Nil ] as ∞
[ Cons {} a, Nil ] as a
"#
),
)
}
#[test]
#[ignore]
fn mutually_recursive_types_with_type_error() {
report_problem_as(
indoc!(

18
compiler/types/src/subs.rs
View file

@ -1006,7 +1006,20 @@ fn content_to_err_type(
RigidVar(name) => ErrorType::RigidVar(name),
RecursionVar { .. } => todo!(),
RecursionVar { opt_name, .. } => {
let name = match opt_name {
Some(name) => name,
None => {
let name = get_fresh_var_name(state);
subs.set_content(var, FlexVar(Some(name.clone())));
name
}
};
ErrorType::FlexVar(name)
}
Alias(symbol, args, aliased_to) => {
let err_args = args
@ -1103,6 +1116,9 @@ fn flat_type_to_err_type(
ErrorType::TagUnion(sub_tags, sub_ext) => {
ErrorType::TagUnion(sub_tags.union(err_tags), sub_ext)
}
ErrorType::RecursiveTagUnion(_, sub_tags, sub_ext) => {
ErrorType::TagUnion(sub_tags.union(err_tags), sub_ext)
}
ErrorType::FlexVar(var) => {
ErrorType::TagUnion(err_tags, TypeExt::FlexOpen(var))