From 02e4ce14d9526b69fc0eb0bfcaf40ef7d21aa722 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Wed, 16 Feb 2022 20:07:55 -0500 Subject: [PATCH] feat: no extra space in patterns --- src/rules/pattern.rs | 3 ++- tests/cases/lambda/out | 6 +++--- tests/cases/pat_bind/out | 16 ++++++++-------- tests/cases/pattern/out | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/rules/pattern.rs b/src/rules/pattern.rs index 435191c..517b492 100644 --- a/src/rules/pattern.rs +++ b/src/rules/pattern.rs @@ -153,8 +153,9 @@ pub fn rule( // } let child = children.get_next().unwrap(); steps.push_back(crate::builder::Step::Dedent); - if !has_comments_between_curly_b && items_count <= 1 { + if !has_comments_between_curly_b && items_count == 1 { steps.push_back(crate::builder::Step::Whitespace); + } else if !has_comments_between_curly_b && items_count == 0 { } else { if let rnix::SyntaxKind::NODE_PAT_ENTRY = last_kind { steps.push_back(crate::builder::Step::Token( diff --git a/tests/cases/lambda/out b/tests/cases/lambda/out index 4b4c3f5..17a06a9 100644 --- a/tests/cases/lambda/out +++ b/tests/cases/lambda/out @@ -7,7 +7,7 @@ d ) ( - { }: + {}: b: /* c @@ -16,7 +16,7 @@ ) ( a: - { }: + {}: /* c */ @@ -64,7 +64,7 @@ ) ( a: b: c: - { }: + {}: a: b: c: a ) diff --git a/tests/cases/pat_bind/out b/tests/cases/pat_bind/out index 812edb9..ab77d04 100644 --- a/tests/cases/pat_bind/out +++ b/tests/cases/pat_bind/out @@ -1,19 +1,19 @@ [ - ({ } @ a: _) + ({} @ a: _) ( - { } @ + {} @ /**/ a: _ ) ( - { } + {} /**/ @ a: _ ) ( - { } + {} /**/ @ /**/ @@ -21,17 +21,17 @@ _ ) - (a @ { }: _) + (a @ {}: _) ( a @ /**/ - { }: + {}: _ ) ( a /**/ - @ { }: + @ {}: _ ) ( @@ -39,7 +39,7 @@ /**/ @ /**/ - { }: + {}: _ ) ] diff --git a/tests/cases/pattern/out b/tests/cases/pattern/out index bbf081b..4b6e84f 100644 --- a/tests/cases/pattern/out +++ b/tests/cases/pattern/out @@ -8,7 +8,7 @@ @ inp: _ ) - ({ }: _) + ({}: _) ({ a }: _) ( {