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

correctly parse trailing commas in record

Browse source
This commit is contained in:
Sébastien Besnier 2020-11-13 18:43:32 +01:00
parent 7ec161c415
commit 58acc59b01
8 changed files with 135 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -278,7 +278,7 @@ fn expr_to_pattern<'a>(arena: &'a Bump, expr: &Expr<'a>) -> Result<Pattern<'a>,
Expr::Record {
fields,
update: None,
trailing_comma: _,
final_comments: _,
} => {
let mut loc_patterns = Vec::with_capacity_in(fields.len(), arena);
@ -1872,14 +1872,14 @@ fn record_literal<'a>(min_indent: u16) -> impl Parser<'a, Expr<'a>> {
))
),
move |arena, state, (loc_record, opt_def)| {
let (opt_update, loc_assigned_fields) = loc_record.value;
let (opt_update, loc_assigned_fields_with_comments) = loc_record.value;
match opt_def {
None => {
// This is a record literal, not a destructure.
let mut value = Expr::Record {
update: opt_update.map(|loc_expr| &*arena.alloc(loc_expr)),
fields: loc_assigned_fields.value.into_bump_slice(),
trailing_comma: arena.alloc(crate::ast::TrailingComma::None),
fields: loc_assigned_fields_with_comments.value.0.into_bump_slice(),
final_comments: loc_assigned_fields_with_comments.value.1,
};
// there can be field access, e.g. `{ x : 4 }.x`
@ -1902,8 +1902,8 @@ fn record_literal<'a>(min_indent: u16) -> impl Parser<'a, Expr<'a>> {
}
Some((spaces_before_equals, Either::First(equals_indent))) => {
// This is a record destructure def.
let region = loc_assigned_fields.region;
let assigned_fields = loc_assigned_fields.value;
let region = loc_assigned_fields_with_comments.region;
let assigned_fields = loc_assigned_fields_with_comments.value.0;
let mut loc_patterns = Vec::with_capacity_in(assigned_fields.len(), arena);
for loc_assigned_field in assigned_fields {
@ -1940,8 +1940,8 @@ fn record_literal<'a>(min_indent: u16) -> impl Parser<'a, Expr<'a>> {
}
Some((spaces_before_colon, Either::Second(colon_indent))) => {
// This is a record type annotation
let region = loc_assigned_fields.region;
let assigned_fields = loc_assigned_fields.value;
let region = loc_assigned_fields_with_comments.region;
let assigned_fields = loc_assigned_fields_with_comments.value.0;
let mut loc_patterns = Vec::with_capacity_in(assigned_fields.len(), arena);
for loc_assigned_field in assigned_fields {