language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 13:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge remote-tracking branch 'origin/trunk' into outdent-infix

Browse source
This commit is contained in:
Richard Feldman 2022-07-16 16:08:36 -04:00
commit f575807834
No known key found for this signature in database
GPG key ID: 7E4127D1E4241798
116 changed files with 7901 additions and 5073 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/compiler/fmt/src/def.rs
View file

@ -79,7 +79,7 @@ impl<'a> Formattable for TypeDef<'a> {
Opaque {
header: TypeHeader { name, vars },
typ: ann,
derived,
derived: has_abilities,
} => {
buf.indent(indent);
buf.push_str(name.value);
@ -95,28 +95,26 @@ impl<'a> Formattable for TypeDef<'a> {
let ann_is_where_clause =
matches!(ann.extract_spaces().item, TypeAnnotation::Where(..));
// Always put the has-derived clause on a newline if it is itself multiline, or
// the annotation has a where-has clause.
let derived_multiline = if let Some(derived) = derived {
!derived.value.is_empty() && (derived.is_multiline() || ann_is_where_clause)
// Always put the has-abilities clause on a newline if the opaque annotation
// contains a where-has clause.
let has_abilities_multiline = if let Some(has_abilities) = has_abilities {
!has_abilities.value.is_empty() && ann_is_where_clause
} else {
false
};
let make_multiline = ann.is_multiline() || derived_multiline;
let make_multiline = ann.is_multiline() || has_abilities_multiline;
ann.format(buf, indent);
if let Some(derived) = derived {
if !make_multiline {
buf.spaces(1);
}
if let Some(has_abilities) = has_abilities {
buf.spaces(1);
derived.format_with_options(
has_abilities.format_with_options(
buf,
Parens::NotNeeded,
Newlines::from_bool(make_multiline),
indent + INDENT,
indent + 1 + INDENT,
);
}
}