RomanNum3ral
/
zoxide
mirror of https://github.com/ajeetdsouza/zoxide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(fish): prefix builtin for all non-reserved words (#865)

This commit is contained in:
phanium 2024-08-04 01:42:09 +08:00 committed by GitHub
parent d655e026f5
commit 297499a4fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
templates/fish.txt
View File

@ -71,11 +71,11 @@ end
if test -z $__zoxide_z_prefix if test -z $__zoxide_z_prefix
set __zoxide_z_prefix 'z!' set __zoxide_z_prefix 'z!'
end end
set __zoxide_z_prefix_regex ^(string escape --style=regex $__zoxide_z_prefix) set __zoxide_z_prefix_regex ^(string escape --style=regex -- $__zoxide_z_prefix)
# Jump to a directory using only keywords. # Jump to a directory using only keywords.
function __zoxide_z function __zoxide_z
set -l argc (count $argv) set -l argc (builtin count $argv)
if test $argc -eq 0 if test $argc -eq 0
__zoxide_cd $HOME __zoxide_cd $HOME
else if test "$argv" = - else if test "$argv" = -
@ -94,19 +94,19 @@ end
# Completions. # Completions.
function __zoxide_z_complete function __zoxide_z_complete
set -l tokens (commandline --current-process --tokenize) set -l tokens (builtin commandline --current-process --tokenize)
set -l curr_tokens (commandline --cut-at-cursor --current-process --tokenize) set -l curr_tokens (builtin commandline --cut-at-cursor --current-process --tokenize)
if test (count $tokens) -le 2 -a (count $curr_tokens) -eq 1 if test (builtin count $tokens) -le 2 -a (builtin count $curr_tokens) -eq 1
# If there are < 2 arguments, use `cd` completions. # If there are < 2 arguments, use `cd` completions.
complete --do-complete "'' "(commandline --cut-at-cursor --current-token) | string match --regex '.*/$' complete --do-complete "'' "(builtin commandline --cut-at-cursor --current-token) | string match --regex -- '.*/$'
else if test (count $tokens) -eq (count $curr_tokens); and ! string match --quiet --regex $__zoxide_z_prefix_regex. $tokens[-1] else if test (builtin count $tokens) -eq (builtin count $curr_tokens); and ! string match --quiet --regex -- $__zoxide_z_prefix_regex. $tokens[-1]
# If the last argument is empty and the one before doesn't start with # If the last argument is empty and the one before doesn't start with
# $__zoxide_z_prefix, use interactive selection. # $__zoxide_z_prefix, use interactive selection.
set -l query $tokens[2..-1] set -l query $tokens[2..-1]
set -l result (zoxide query --exclude (__zoxide_pwd) --interactive -- $query) set -l result (command zoxide query --exclude (__zoxide_pwd) --interactive -- $query)
and echo $__zoxide_z_prefix$result and builtin echo $__zoxide_z_prefix$result
commandline --function repaint builtin commandline --function repaint
end end
end end
complete --command __zoxide_z --no-files --arguments '(__zoxide_z_complete)' complete --command __zoxide_z --no-files --arguments '(__zoxide_z_complete)'
@ -124,10 +124,10 @@ end
{%- match cmd %} {%- match cmd %}
{%- when Some with (cmd) %} {%- when Some with (cmd) %}
abbr --erase {{cmd}} &>/dev/null builtin abbr --erase {{cmd}} &>/dev/null
alias {{cmd}}=__zoxide_z alias {{cmd}}=__zoxide_z
abbr --erase {{cmd}}i &>/dev/null builtin abbr --erase {{cmd}}i &>/dev/null
alias {{cmd}}i=__zoxide_zi alias {{cmd}}i=__zoxide_zi
{%- when None %} {%- when None %}