From 1bc43972ea7b2ac4cf9522b58c1c08a4c30c8959 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 23 Dec 2023 02:14:26 -0800 Subject: [PATCH] syntax: add pre_command() and post_command() helper functions --- src/cmd.rs | 5 +++-- src/syntax.rs | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/cmd.rs b/src/cmd.rs index 19cb9cfa..50efa7e4 100644 --- a/src/cmd.rs +++ b/src/cmd.rs @@ -1,6 +1,7 @@ use super::errors; use super::eval; use super::model; +use super::syntax; /// Convert an exit status to Result<(), GardenError>. pub(crate) fn result_from_exit_status(exit_status: i32) -> Result<(), errors::GardenError> { @@ -231,8 +232,8 @@ pub(crate) fn expand_command_names( context: &model::TreeContext, name: &str, ) -> Vec { - let pre_name = format!("{}<", name); - let post_name = format!("{}>", name); + let pre_name = syntax::pre_command(name); + let post_name = syntax::post_command(name); let pre_commands = get_command_values(app_context, context, &pre_name); let post_commands = get_command_values(app_context, context, &post_name); diff --git a/src/syntax.rs b/src/syntax.rs index 0cd8b4d4..e7f8654e 100644 --- a/src/syntax.rs +++ b/src/syntax.rs @@ -176,3 +176,15 @@ pub(crate) fn string_to_bool(value: &str) -> Option { _ => None, } } + +/// Add a pre-command suffix to a command name. +#[inline] +pub(crate) fn pre_command(name: &str) -> String { + format!("{}<", name) +} + +/// Add a post-command suffix to a command name. +#[inline] +pub(crate) fn post_command(name: &str) -> String { + format!("{}>", name) +}