From 83ac723a50e3ddb66676942b5a8c256f92f9c63c Mon Sep 17 00:00:00 2001 From: KtorZ Date: Thu, 19 Sep 2024 20:23:56 +0200 Subject: [PATCH] Fix extraneous space added after multiline alternative patterns --- CHANGELOG.md | 1 + crates/aiken-lang/src/format.rs | 2 +- .../tests/snapshots/multiline_alternative_patterns.snap | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c29f371..419ce771 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - **aiken-project**: Provide intermediate feedback when looking for counterexamples during property tests. @KtorZ - **aiken-lang**: Fix formatter adding extra unnecessary newlines after literal lists clause values or assignments. @KtorZ - **aiken-lang**: Fix formatting of long multi-line if/is expressions. @KtorZ +- **aiken-lang**: Fix extraneous white-space added by the formatter after multiline alternative patterns. @KtorZ - **uplc**: Fix cost-models for PlutusV1 & PlutusV2. @MicroProofs ### Removed diff --git a/crates/aiken-lang/src/format.rs b/crates/aiken-lang/src/format.rs index 21a89dff..81443609 100644 --- a/crates/aiken-lang/src/format.rs +++ b/crates/aiken-lang/src/format.rs @@ -1901,7 +1901,7 @@ impl<'comments> Formatter<'comments> { let space_before = self.pop_empty_lines(clause.location.start); let clause_doc = join( clause.patterns.iter().map(|p| self.pattern(p)), - break_(" | ", " | "), + break_(" |", " | "), ) .group(); diff --git a/crates/aiken-lang/src/tests/snapshots/multiline_alternative_patterns.snap b/crates/aiken-lang/src/tests/snapshots/multiline_alternative_patterns.snap index ef36ad87..29752af2 100644 --- a/crates/aiken-lang/src/tests/snapshots/multiline_alternative_patterns.snap +++ b/crates/aiken-lang/src/tests/snapshots/multiline_alternative_patterns.snap @@ -11,13 +11,13 @@ validator direct_proxy { RegisterDelegateRepresentative { delegate_representative: credential, .. - } | + } | UnregisterDelegateRepresentative { delegate_representative: credential, .. - } | - RegisterCredential { credential, .. } | - UnregisterCredential { credential, .. } | + } | + RegisterCredential { credential, .. } | + UnregisterCredential { credential, .. } | RegisterAndDelegateCredential { credential, .. } -> credential == Script(policy_id) _ -> False