language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 06:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Propogate original annotation region down in AnnotationSource

Browse source 
This makes it easier for error reporting to find the relevant
annotations that were part of a type error, and display that in the
error message presented to a user.
This commit is contained in:
ayazhafiz 2021-11-20 23:46:37 -05:00
parent 7a0ecbd262
commit 62873fed81
3 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/constrain/src/expr.rs
View file

@ -448,7 +448,7 @@ pub fn constrain_expr(
branch_cons.push(cond_var_is_bool_con);
match expected {
FromAnnotation(name, arity, _, tipe) => {
FromAnnotation(name, arity, ann_source, tipe) => {
let num_branches = branches.len() + 1;
for (index, (loc_cond, loc_body)) in branches.iter().enumerate() {
let cond_con = constrain_expr(
@ -468,6 +468,7 @@ pub fn constrain_expr(
AnnotationSource::TypedIfBranch {
index: Index::zero_based(index),
num_branches,
region: ann_source.region(),
},
tipe.clone(),
),
@ -487,6 +488,7 @@ pub fn constrain_expr(
AnnotationSource::TypedIfBranch {
index: Index::zero_based(branches.len()),
num_branches,
region: ann_source.region(),
},
tipe.clone(),
),
@ -577,7 +579,7 @@ pub fn constrain_expr(
constraints.push(expr_con);
match &expected {
FromAnnotation(name, arity, _, _typ) => {
FromAnnotation(name, arity, ann_source, _typ) => {
// NOTE deviation from elm.
//
// in elm, `_typ` is used, but because we have this `expr_var` too
@ -604,6 +606,7 @@ pub fn constrain_expr(
*arity,
TypedWhenBranch {
index: Index::zero_based(index),
region: ann_source.region(),
},
typ.clone(),
),