h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-31 12:21:19 -03:00
Code Issues Packages Projects Releases Wiki Activity

competions/env: only invoke subcommand completions once

Browse Source 
This prevents a seemingly infinite loop in
fish -c 'alias ssh "env ssh"; complete -C "ssh "'

It still prints "maximum recursion depth exceeded", but a follow-up commit
will work around that.

Fixes #7389
This commit is contained in:
Johannes Altmanninger
2020-10-10 08:19:06 +02:00
parent f917211f3b
commit a635d78976
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
share/completions/env.fish
View File

@@ -1,4 +1,4 @@
function __fish_complete_env_subcommand function __fish_env_remaining_args
argparse -s s/ignore-environment u/unset= h-help v-version -- (commandline -opc) (commandline -ct) 2>/dev/null argparse -s s/ignore-environment u/unset= h-help v-version -- (commandline -opc) (commandline -ct) 2>/dev/null
or return 1 or return 1
@@ -15,19 +15,23 @@ function __fish_complete_env_subcommand
end end
end end
# Then complete the rest as if it was given as a command. string join \n -- $argv
if test -n "$argv"
# Return true if there is a subcommand.
set -q argv[1]
end
function __fish_complete_env_subcommand
if set -l argv (__fish_env_remaining_args)
__fish_complete_subcommand --commandline $argv __fish_complete_subcommand --commandline $argv
return 0
end end
return 1
end end
complete -c env -a "(__fish_complete_env_subcommand)" complete -c env -a "(__fish_complete_env_subcommand)"
# complete VAR= only if the cursor is left of the =, otherwise complete the file right of the = # complete VAR= only if the cursor is left of the =, otherwise complete the file right of the =
complete -c env -n 'not __fish_complete_env_subcommand; and not string match -eq = -- (commandline -ct)' -a "(set -n)=" -f -d "Redefine variable" complete -c env -n 'not __fish_env_remaining_args; and not string match -eq = -- (commandline -ct)' -a "(set -n)=" -f -d "Redefine variable"
complete -c env -n 'not __fish_complete_env_subcommand' -s i -l ignore-environment -d "Start with an empty environment" complete -c env -n 'not __fish_env_remaining_args' -s i -l ignore-environment -d "Start with an empty environment"
complete -c env -n 'not __fish_complete_env_subcommand' -s u -l unset -d "Remove variable from the environment" -x -a "(set -n)" complete -c env -n 'not __fish_env_remaining_args' -s u -l unset -d "Remove variable from the environment" -x -a "(set -n)"
complete -c env -n 'not __fish_complete_env_subcommand' -l help -d "Display help and exit" complete -c env -n 'not __fish_env_remaining_args' -l help -d "Display help and exit"
complete -c env -n 'not __fish_complete_env_subcommand' -l version -d "Display version and exit" complete -c env -n 'not __fish_env_remaining_args' -l version -d "Display version and exit"