helix

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

Diffstat (limited to 'helix-stdx/src/env.rs')

-rw-r--r--

1 files changed, 7 insertions, 0 deletions

diff --git a/helix-stdx/src/env.rs b/helix-stdx/src/env.rs
index 6e14c7a8..b3f46c25 100644
--- a/helix-stdx/src/env.rs
+++ b/helix-stdx/src/env.rs

@@ -103,6 +103,12 @@ fn expand_impl(src: &OsStr, mut resolve: impl FnMut(&OsStr) -> Option<OsString>)

let mat = captures.get_match().unwrap();

let pattern_id = mat.pattern().as_usize();

let mut range = mat.range();

+ // A pattern may match multiple times on a single variable, for example `${HOME:-$HOME}`:

+ // `${HOME:-` matches and also the default value (`$HOME`). Skip past any variables which

+ // have already been expanded.

+ if range.start < pos {

+ continue;

+ }

let var = &bytes[captures.get_group(1).unwrap().range()];

let default = if pattern_id != 5 {

let Some(bracket_pos) = find_brace_end(&bytes[range.end..]) else {

@@ -203,6 +209,7 @@ mod tests {

assert_env_expand!(env, "bar/$FOO/baz", "bar/foo/baz");

assert_env_expand!(env, "bar/${FOO}/baz", "bar/foo/baz");

assert_env_expand!(env, "baz/${BAR:-bar}/foo", "baz/bar/foo");

+ assert_env_expand!(env, "baz/${FOO:-$FOO}/foo", "baz/foo/foo");

assert_env_expand!(env, "baz/${BAR:=bar}/foo", "baz/bar/foo");

assert_env_expand!(env, "baz/${BAR-bar}/foo", "baz/bar/foo");

assert_env_expand!(env, "baz/${BAR=bar}/foo", "baz/bar/foo");