From 4cad053e157e27c362ee07c07d93246dd02c5f04 Mon Sep 17 00:00:00 2001 From: rvcas Date: Tue, 1 Nov 2022 19:59:45 -0400 Subject: [PATCH] fix: capture variables are a bit different --- crates/lang/src/ast.rs | 2 +- crates/lang/src/format.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/lang/src/ast.rs b/crates/lang/src/ast.rs index 31eecbb8..f263043e 100644 --- a/crates/lang/src/ast.rs +++ b/crates/lang/src/ast.rs @@ -241,7 +241,7 @@ pub struct CallArg { impl CallArg { pub fn is_capture_hole(&self) -> bool { match &self.value { - UntypedExpr::Var { ref name, .. } => name == CAPTURE_VARIABLE, + UntypedExpr::Var { ref name, .. } => name.contains(CAPTURE_VARIABLE), _ => false, } } diff --git a/crates/lang/src/format.rs b/crates/lang/src/format.rs index 53fca843..b01eb2e4 100644 --- a/crates/lang/src/format.rs +++ b/crates/lang/src/format.rs @@ -608,7 +608,7 @@ impl<'comments> Formatter<'comments> { UntypedExpr::Sequence { expressions, .. } => self.sequence(expressions), - UntypedExpr::Var { name, .. } if name == CAPTURE_VARIABLE => "_".to_doc(), + UntypedExpr::Var { name, .. } if name.contains(CAPTURE_VARIABLE) => "_".to_doc(), UntypedExpr::Var { name, .. } => name.to_doc(), @@ -860,7 +860,7 @@ impl<'comments> Formatter<'comments> { Some(CallArg { value: UntypedExpr::Var { name, .. }, .. - }) if name == CAPTURE_VARIABLE + }) if name.contains(CAPTURE_VARIABLE) ); if hole_in_first_position && args.len() == 1 {