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

actually use the new parser

Browse source
This commit is contained in:
Folkert 2022-05-26 15:32:04 +02:00
parent fa9ac912a0
commit bab81fd941
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
3 changed files with 35 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

28
compiler/parse/src/expr.rs
View file

@ -945,11 +945,10 @@ fn parse_toplevel_defs_end<'a>(
let region = Region::span_across(&ann_pattern.region, &region);
defs.push_value_def(
defs.replace_with_value_def(
defs.tags.len() - 1,
value_def,
region,
spaces_before_current,
&[],
)
}
Some(Ok(TypeDef::Alias {
@ -982,11 +981,10 @@ fn parse_toplevel_defs_end<'a>(
let region = Region::span_across(&header.name.region, &region);
defs.push_value_def(
defs.replace_with_value_def(
defs.tags.len() - 1,
value_def,
region,
spaces_before_current,
&[],
)
}
_ => {
@ -2313,16 +2311,18 @@ pub fn toplevel_defs<'a>(min_indent: u32) -> impl Parser<'a, Defs<'a>, EExpr<'a>
let (_, final_space, state) =
space0_e(start_column, EExpr::IndentEnd).parse(arena, state)?;
// add surrounding whitespace
let before = Slice::extend_new(&mut output.spaces, initial_space.iter().copied());
let after = Slice::extend_new(&mut output.spaces, final_space.iter().copied());
if !output.tags.is_empty() {
// add surrounding whitespace
let after = Slice::extend_new(&mut output.spaces, final_space.iter().copied());
let before = Slice::extend_new(&mut output.spaces, initial_space.iter().copied());
debug_assert!(output.space_before[0].is_empty());
output.space_before[0] = before;
debug_assert!(output.space_before[0].is_empty());
output.space_before[0] = before;
let last = output.tags.len() - 1;
debug_assert!(output.space_after[last].is_empty() || after.is_empty());
output.space_after[last] = after;
let last = output.tags.len() - 1;
debug_assert!(output.space_after[last].is_empty() || after.is_empty());
output.space_after[last] = after;
}
Ok((MadeProgress, output, state))
}