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

de-alias when diffing with a non-alias

Browse source 
When one of the types in a comparison is an alias, elm does not de-alias it.
That is really annoying if e.g. the alias is of a record and you used an invalid field: the field suggestion error does not kick in
This commit is contained in:
Folkert 2020-04-11 23:51:51 +02:00
parent 2811f978a4
commit d15bd07bf4
5 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/reporting/src/report.rs
View file

@ -462,7 +462,7 @@ impl<'a> RocDocAllocator<'a> {
self.intersperse(docs, self.line())
}
/// live vcat, but adds a double line break between elements. Visually this means an empty line
/// like vcat, but adds a double line break between elements. Visually this means an empty line
/// between elements.
pub fn stack<A, I>(&'a self, docs: I) -> DocBuilder<'a, Self, A>
where

13
compiler/reporting/src/type_error.rs
View file

@ -170,7 +170,7 @@ fn to_expr_report<'b>(
alloc.keyword("if"),
alloc.text(" expression:"),
]),
TypedWhenBranch(index) => alloc.concat(vec![
TypedWhenBranch { index } => alloc.concat(vec![
alloc.string(index.ordinal()),
alloc.reflow(" branch of this "),
alloc.keyword("when"),
@ -185,7 +185,7 @@ fn to_expr_report<'b>(
let it_is = match annotation_source {
TypedIfBranch { index, .. } => format!("The {} branch is", index.ordinal()),
TypedWhenBranch(index) => format!("The {} branch is", index.ordinal()),
TypedWhenBranch { index, .. } => format!("The {} branch is", index.ordinal()),
TypedBody => "The body is".into(),
};
@ -1319,6 +1319,15 @@ fn to_diff<'b>(
}
}
(Alias(symbol, _, actual), other) if !symbol.module_id().is_builtin() => {
// when diffing an alias with a non-alias, de-alias
to_diff(alloc, parens, *actual, other)
}
(other, Alias(symbol, _, actual)) if !symbol.module_id().is_builtin() => {
// when diffing an alias with a non-alias, de-alias
to_diff(alloc, parens, other, *actual)
}
(Record(fields1, ext1), Record(fields2, ext2)) => {
diff_record(alloc, fields1, ext1, fields2, ext2)
}