Skip to content

fix(pwd): guard truncation-branch string ops with -- for leading-dash dirs #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Frefreak wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(pwd): guard truncation-branch string ops with -- for leading-dash dirs #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c7b384
fix(pwd): guard truncation-branch string ops with -- for leading-dash…
Jul 27, 2026
524be08
test(pwd): isolate leading-dash truncation case
Aug 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions functions/_tide_pwd.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ eval "function _tide_pwd
if path is \$parent_dir/\$dir_section/\$tide_pwd_markers
set split_output[\$i] \"$color_anchors\$dir_section$reset_to_color_dirs\"
else if test \$_tide_pwd_len -gt \$dist_btwn_sides
string match -qr \"(?<trunc>\..|.)\" \$dir_section
string match -qr \"(?<trunc>\..|.)\" -- \$dir_section

set -l glob \$parent_dir/\$trunc*/
set -e glob[(contains -i \$parent_dir/\$dir_section/ \$glob)] # This is faster than inverse string match

while string match -qr \"^\$parent_dir/\$(string escape --style=regex \$trunc)\" \$glob &&
string match -qr \"(?<trunc>\$(string escape --style=regex \$trunc).)\" \$dir_section
while string match -qr \"^\$parent_dir/\$(string escape --style=regex -- \$trunc)\" \$glob &&
string match -qr \"(?<trunc>\$(string escape --style=regex -- \$trunc).)\" -- \$dir_section
end
test -n \"\$trunc\" && set split_output[\$i] \"$color_truncated\$trunc$reset_to_color_dirs\" &&
string join / \$split_output | string length -V | read _tide_pwd_len
string join / -- \$split_output | string length -V | read _tide_pwd_len
end
end

Expand Down
9 changes: 9 additions & 0 deletions tests/_tide_item_pwd.test.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ _pwd "$tmpdir/tmp/has spaces/foo" # CHECK: ~/tmp/has spaces/foo

mkdir -p "$tmpdir/tmp/--has dashes/foo"
_pwd "$tmpdir/tmp/--has dashes/foo" # CHECK: ~/tmp/--has dashes/foo
command rm -r "$tmpdir/tmp/--has dashes"

mkdir -p "$tmpdir/tmp/has'quotes''/foo"
_pwd "$tmpdir/tmp/has'quotes''/foo" # CHECK: ~/tmp/has'quotes''/foo
Expand All @@ -130,5 +131,13 @@ mkdir -p "$tmpdir/tmp/[hello"
_pwd $tmpdir/tmp/$longDirWithDot # CHECK: ~/t/[t/b/c/d/e/f/golf/hotel/india/juliett/kilo/lima/mike/november/oscar/papa
command rm -r "$tmpdir/tmp/[hello"

# ---------- Truncation with a leading-dash directory ----------
set -l longDirDash -alfa/bravo/charlie/delta/echo/foxtrot/golf/hotel/india/juliett/kilo/lima/mike/november/oscar/papa
_pwd $tmpdir/tmp/$longDirDash # CHECK: ~/t/-/b/c/d/e/f/golf/hotel/india/juliett/kilo/lima/mike/november/oscar/papa

mkdir -p $tmpdir/tmp/-alfawolf
_pwd $tmpdir/tmp/$longDirDash # CHECK: ~/t/-alfa/b/c/d/e/f/golf/hotel/india/juliett/kilo/lima/mike/november/oscar/papa
command rm -r $tmpdir/tmp/-alfawolf

# ------------------------------------Cleanup------------------------------------
command rm -r $tmpdir
Loading