From e118051a5cc207f10a4972c0d3f3a1af701ea534 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Thu, 11 Apr 2019 15:57:34 -0700 Subject: [PATCH] Omit aliases that begin with `_` from --list` (#398) --- README.adoc | 2 +- src/alias.rs | 1 + src/parser.rs | 1 + src/run.rs | 4 ++++ tests/integration.rs | 11 +++++++++++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index d6df2c8..f123b89 100644 --- a/README.adoc +++ b/README.adoc @@ -608,7 +608,7 @@ Run `just --help` to see all the options. === Private Recipes -Recipes whose name starts with a `_` are omitted from `just --list`: +Recipes and aliases whose name starts with a `_` are omitted from `just --list`: ```make test: _test-helper diff --git a/src/alias.rs b/src/alias.rs index c33c202..ec733da 100644 --- a/src/alias.rs +++ b/src/alias.rs @@ -4,6 +4,7 @@ pub struct Alias<'a> { pub name: &'a str, pub target: &'a str, pub line_number: usize, + pub private: bool, } impl<'a> Display for Alias<'a> { diff --git a/src/parser.rs b/src/parser.rs index 497434e..19b6a92 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -372,6 +372,7 @@ impl<'a> Parser<'a> { Alias { name: name.lexeme, line_number: name.line, + private: name.lexeme.starts_with('_'), target, }, ); diff --git a/src/run.rs b/src/run.rs index 0f2c2f7..afa55bc 100644 --- a/src/run.rs +++ b/src/run.rs @@ -358,6 +358,10 @@ pub fn run() { // Construct a target to alias map. let mut recipe_aliases: BTreeMap<&str, Vec<&str>> = BTreeMap::new(); for alias in justfile.aliases.values() { + if alias.private { + continue; + } + if !recipe_aliases.contains_key(alias.target) { recipe_aliases.insert(alias.target, vec![alias.name]); } else { diff --git a/tests/integration.rs b/tests/integration.rs index f94f7e1..aa8af3d 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -132,6 +132,17 @@ integration_test! { status: EXIT_SUCCESS, } +integration_test! { + name: alias_listing_private, + justfile: "foo PARAM='foo':\n echo {{PARAM}}\nalias _f = foo", + args: ("--list"), + stdout: "Available recipes: + foo PARAM='foo' +", + stderr: "", + status: EXIT_SUCCESS, +} + integration_test! { name: alias, justfile: "foo:\n echo foo\nalias f = foo",