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

Implement better comparisons between alias and body

Browse source
This commit is contained in:
Joshua Warner 2024-12-11 21:22:59 -08:00
parent 8b3abafa08
commit 07f7252573
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
5 changed files with 87 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/compiler/parse/src/expr.rs
View file

@ -3201,11 +3201,7 @@ fn stmts_to_defs<'a>(
) = (td, stmts.get(i + 1).map(|s| (s.before, s.item.value)))
{
if (spaces_middle.len() <= 1 && !ends_with_spaces_conservative(&ann_type.value))
|| header
.vars
.first()
.map(|var| var.value.equivalent(&loc_pattern.value))
.unwrap_or(false)
|| header_to_pat(arena, header).equivalent(&loc_pattern.value)
{
// This is a case like
// UserId x : [UserId Int]
@ -3322,6 +3318,17 @@ fn stmts_to_defs<'a>(
Ok((defs, last_expr))
}
fn header_to_pat<'a>(arena: &'a Bump, header: TypeHeader<'a>) -> Pattern<'a> {
if header.vars.is_empty() {
Pattern::Tag(header.name.value)
} else {
Pattern::Apply(
arena.alloc(Loc::at(header.name.region, Pattern::Tag(header.name.value))),
header.vars,
)
}
}
fn ends_with_spaces_conservative(ty: &TypeAnnotation<'_>) -> bool {
match ty {
TypeAnnotation::Function(_, _, res) => ends_with_spaces_conservative(&res.value),