mirror of
https://github.com/roc-lang/roc.git
synced 2025-09-28 14:24:45 +00:00
add TrailingComma to Record & little formatter refactor
This commit is contained in:
parent
a788407caa
commit
6ad1bb233a
6 changed files with 84 additions and 54 deletions
|
@ -196,10 +196,12 @@ pub enum Expr<'a> {
|
|||
AccessorFunction(&'a str),
|
||||
|
||||
// Collection Literals
|
||||
List(&'a [&'a Loc<Expr<'a>>]),
|
||||
List (&'a [&'a Loc<Expr<'a>>]),
|
||||
|
||||
Record {
|
||||
update: Option<&'a Loc<Expr<'a>>>,
|
||||
fields: &'a [Loc<AssignedField<'a, Expr<'a>>>],
|
||||
trailing_comma: &'a TrailingComma<'a>,
|
||||
},
|
||||
|
||||
// Lookups
|
||||
|
@ -383,7 +385,23 @@ pub enum AssignedField<'a, Val> {
|
|||
Malformed(&'a str),
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
pub enum TrailingComma<'a> {
|
||||
None,
|
||||
FollowedBy(&'a [CommentOrNewline<'a>]),
|
||||
}
|
||||
|
||||
impl<'a> TrailingComma<'a> {
|
||||
pub fn is_multiline(&self) -> bool {
|
||||
match self {
|
||||
TrailingComma::None => false,
|
||||
TrailingComma::FollowedBy(comments_or_newlines) =>
|
||||
(*comments_or_newlines).len() > 1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
pub enum CommentOrNewline<'a> {
|
||||
Newline,
|
||||
LineComment(&'a str),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue