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

Move TypeAnnotation::Function to to_node

Browse source
This commit is contained in:
Joshua Warner 2024-12-19 16:44:06 -05:00
parent 3a7265baed
commit f169329c0e
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
3 changed files with 139 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

81
crates/compiler/fmt/src/node.rs
View file

@ -4,7 +4,7 @@ use roc_parse::ast::{CommentOrNewline, Pattern, Spaces, TypeAnnotation};
use crate::{
annotation::{Formattable, Newlines, Parens},
collection::Braces,
spaces::{fmt_spaces, INDENT},
spaces::{fmt_spaces, fmt_spaces_no_blank_lines, INDENT},
Buf,
};
@ -54,12 +54,49 @@ pub enum Node<'a> {
rest: &'a [(Sp<'a>, Node<'a>)],
},
DelimitedSequence(Braces, &'a [(Sp<'a>, Node<'a>)], Sp<'a>),
CommaSequence {
allow_blank_lines: bool,
first: &'a Node<'a>,
rest: &'a [Item<'a>],
},
// Temporary! TODO: translate these into proper Node elements
TypeAnnotation(TypeAnnotation<'a>),
Pattern(Pattern<'a>),
}
#[derive(Copy, Clone, Debug)]
pub struct Item<'a> {
pub before: &'a [CommentOrNewline<'a>],
pub comma: bool,
pub newline: bool,
pub space: bool,
pub node: Node<'a>,
}
impl<'a> Item<'a> {
fn is_multiline(&self) -> bool {
self.newline || !self.before.is_empty() || self.node.is_multiline()
}
}
impl<'a> Node<'a> {
pub fn space_seq_3(
arena: &'a Bump,
a: Node<'a>,
b_sp: &'a [CommentOrNewline<'a>],
c: Node<'a>,
d_sp: &'a [CommentOrNewline<'a>],
e: Node<'a>,
) -> Node<'a> {
Node::Sequence {
first: arena.alloc(a),
extra_indent_for_rest: true,
rest: arena.alloc_slice_copy(&[(Sp::with_space(b_sp), c), (Sp::with_space(d_sp), e)]),
}
}
}
pub fn parens_around_node<'a, 'b: 'a>(
arena: &'a Bump,
item: Spaces<'b, Node<'b>>,
@ -105,12 +142,6 @@ fn fmt_sp(buf: &mut Buf, sp: Sp<'_>, indent: u16) {
impl<'a> Formattable for Node<'a> {
fn is_multiline(&self) -> bool {
match self {
Node::DelimitedSequence(_braces, lefts, right) => {
right.comments.is_empty()
&& lefts
.iter()
.any(|(sp, l)| l.is_multiline() || !sp.comments.is_empty())
}
Node::Sequence {
first,
extra_indent_for_rest: _,
@ -121,6 +152,17 @@ impl<'a> Formattable for Node<'a> {
.iter()
.any(|(sp, l)| l.is_multiline() || !sp.comments.is_empty())
}
Node::DelimitedSequence(_braces, lefts, right) => {
right.comments.is_empty()
&& lefts
.iter()
.any(|(sp, l)| l.is_multiline() || !sp.comments.is_empty())
}
Node::CommaSequence {
allow_blank_lines: _,
first,
rest,
} => first.is_multiline() || rest.iter().any(|item| item.is_multiline()),
Node::Literal(_) => false,
Node::TypeAnnotation(type_annotation) => type_annotation.is_multiline(),
Node::Pattern(pat) => pat.is_multiline(),
@ -161,6 +203,31 @@ impl<'a> Formattable for Node<'a> {
l.format_with_options(buf, parens, newlines, next_indent);
}
}
Node::CommaSequence {
allow_blank_lines,
first,
rest,
} => {
buf.indent(indent);
first.format_with_options(buf, parens, newlines, indent);
for item in *rest {
if item.comma {
buf.push(',');
}
if *allow_blank_lines {
fmt_spaces(buf, item.before.iter(), indent);
} else {
fmt_spaces_no_blank_lines(buf, item.before.iter(), indent);
}
if item.newline {
buf.ensure_ends_with_newline();
} else if item.space {
buf.ensure_ends_with_whitespace();
}
item.node.format_with_options(buf, parens, newlines, indent);
}
}
Node::Literal(text) => {
buf.indent(indent);
buf.push_str(text);