RGBCube/alejandra
1
Fork 0
mirror of https://github.com/RGBCube/alejandra synced 2025-08-01 04:57:44 +00:00
Code Issues Activity

feat: less indented if-then-else

Browse source
This commit is contained in:
Kevin Amado 2022-02-23 16:09:49 -05:00
parent 07d79340ed
commit 52a85dd4d7
3 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/alejandra_engine/src/rules/if_else.rs
View file

@ -64,7 +64,14 @@ pub fn rule(
if if_else.comments_before_then_expr.is_empty() { if if_else.comments_before_then_expr.is_empty() {
// expr // expr
let element = if_else.then_expr.unwrap(); let element = if_else.then_expr.unwrap();
if crate::builder::fits_in_single_line(build_ctx, element.clone()) { if matches!(
element.kind(),
rnix::SyntaxKind::NODE_ATTR_SET
| rnix::SyntaxKind::NODE_LET_IN
| rnix::SyntaxKind::NODE_LIST
| rnix::SyntaxKind::NODE_STRING
) || crate::builder::fits_in_single_line(build_ctx, element.clone())
{
steps.push_back(crate::builder::Step::Whitespace); steps.push_back(crate::builder::Step::Whitespace);
steps.push_back(crate::builder::Step::FormatWider(element)); steps.push_back(crate::builder::Step::FormatWider(element));
} else { } else {
@ -113,8 +120,14 @@ pub fn rule(
if if_else.comments_before_else_expr.is_empty() { if if_else.comments_before_else_expr.is_empty() {
// expr // expr
let element = if_else.else_expr.unwrap(); let element = if_else.else_expr.unwrap();
if matches!(element.kind(), rnix::SyntaxKind::NODE_IF_ELSE) if matches!(
|| crate::builder::fits_in_single_line(build_ctx, element.clone()) element.kind(),
rnix::SyntaxKind::NODE_ATTR_SET
| rnix::SyntaxKind::NODE_IF_ELSE
| rnix::SyntaxKind::NODE_LET_IN
| rnix::SyntaxKind::NODE_LIST
| rnix::SyntaxKind::NODE_STRING
) || crate::builder::fits_in_single_line(build_ctx, element.clone())
{ {
steps.push_back(crate::builder::Step::Whitespace); steps.push_back(crate::builder::Step::Whitespace);
steps.push_back(crate::builder::Step::FormatWider(element)); steps.push_back(crate::builder::Step::FormatWider(element));

14
src/alejandra_engine/tests/cases/if_else/in
View file

@ -1,4 +1,18 @@
[ [
(if true
then {
version = "1.2.3";
}
else {
version = "3.2.1";
})
(if true
then ''
some text
''
else ''
other text
'')
(if ./a then b else c) (if ./a then b else c)
(if /**/ a /**/ then /**/ b /**/ else /**/ c) (if /**/ a /**/ then /**/ b /**/ else /**/ c)
(if if a then b else c then b else if a then b else if a then b else c) (if if a then b else c then b else if a then b else if a then b else c)

14
src/alejandra_engine/tests/cases/if_else/out
View file

@ -1,4 +1,18 @@
[ [
(if true
then {
version = "1.2.3";
}
else {
version = "3.2.1";
})
(if true
then ''
some text
''
else ''
other text
'')
(if ./a (if ./a
then b then b
else c) else c)