github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-22 03:10:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make most subcommand completions take external commands only

Browse Source 
Also fix ssh completions which were broken by
277fca9c6a26600ce8dc7cb2a035d412a9476868.
This commit is contained in:
Johannes Altmanninger 2019-11-05 10:56:03 +01:00
parent d8b305d6e4
commit 4f1fa9513c
14 changed files with 56 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/completions/and.fish
View File

@ -1,3 +1,3 @@
complete -c and -s h -l help -d 'Display help and exit'
complete -c and -xa '( __fish_complete_subcommand )'
complete -c and -xa '(__fish_complete_subcommand --allow-functions-and-builtins)'

2
share/completions/begin.fish
View File

@ -1,2 +1,2 @@
complete -c begin -s h -l help -d 'Display help and exit'
complete -c begin -xa '(__fish_complete_subcommand)'
complete -c begin -xa '(__fish_complete_subcommand --allow-functions-and-builtins)'

3
share/completions/command.fish
View File

@ -3,5 +3,4 @@ complete -c command -n 'test (count (commandline -opc)) -eq 1' -s a -l all -d 'P
complete -c command -n 'test (count (commandline -opc)) -eq 1' -s q -l quiet -d 'Do not print anything, only set exit status'
complete -c command -n 'test (count (commandline -opc)) -eq 1' -s s -l search -d 'Print the file that would be executed'
complete -c command -n 'test (count (commandline -opc)) -eq 1' -s s -l search -d 'Print the file that would be executed'
complete -c command -n 'test (count (commandline -opc)) -eq 1' -xa "(__fish_complete_external_command)"
complete -c command -n 'test (count (commandline -opc)) -ge 2' -xa "(__fish_complete_subcommand)"
complete -c command -xa "(__fish_complete_subcommand)"

2
share/completions/doas.fish
View File

@ -24,7 +24,7 @@ end
function __fish_complete_doas_subcommand
set -l args (__fish_doas_print_remaining_args)
set -lx -a PATH /usr/local/sbin /sbin /usr/sbin
complete -C "$args"
__fish_complete_subcommand --commandline $args
end
complete -c doas -n "not __fish_doas_print_remaining_args" -s a -d "Choose auth method on systems using /etc/login.conf"

2
share/completions/env.fish
View File

@ -17,7 +17,7 @@ function __fish_complete_env_subcommand
# Then complete the rest as if it was given as a command.
if test -n "$argv"
complete -C "$argv"
__fish_complete_subcomand --commandline $argv
return 0
end
return 1

3
share/completions/exec.fish
View File

@ -1,3 +1,2 @@
complete -c exec -n 'test (count (commandline -opc)) -eq 1' -s h -l help -d 'Display help and exit'
complete -c exec -n 'test (count (commandline -opc)) -eq 1' -xa "(__fish_complete_external_command)"
complete -c exec -n 'test (count (commandline -opc)) -ge 2' -xa "(__fish_complete_subcommand)"
complete -c exec -xa "(__fish_complete_subcommand)"

2
share/completions/if.fish
View File

@ -1,2 +1,2 @@
complete -c if -s h -l help -d 'Display help and exit'
complete -c if -xa '(__fish_complete_subcommand)'
complete -c if -xa '(__fish_complete_subcommand --allow-functions-and-builtins)'

2
share/completions/mosh.fish
View File

@ -4,7 +4,7 @@ complete -x -c mosh -d Hostname -a "(__fish_complete_user_at_hosts)"
complete -x -c mosh -d User -a "
(__fish_print_users)@
"
complete -c mosh -d "Command to run" -x -a '(__fish_complete_subcommand --fcs-skip=2)'
complete -c mosh -n 'test (__fish_number_of_cmd_args_wo_opts) -ge 2' -d "Command to run" -x -a '(__fish_complete_subcommand --fcs-skip=2)'
complete -c mosh -l client -d 'Path to client helper on local machine (default: "mosh-client")'
complete -c mosh -l server -d 'Command to run server helper on remote machine (default: "mosh-server")'

2
share/completions/not.fish
View File

@ -1,2 +1,2 @@
complete -c not -s h -l help -d 'Display help and exit'
complete -c not -xa '(__fish_complete_subcommand)'
complete -c not -xa '(__fish_complete_subcommand --allow-functions-and-builtins)'

2
share/completions/or.fish
View File

@ -1,3 +1,3 @@
complete -c or -s h -l help -d 'Display help and exit'
complete -c or -xa '(__fish_complete_subcommand)'
complete -c or -xa '(__fish_complete_subcommand --allow-functions-and-builtins)'

2
share/completions/ssh.fish
View File

@ -13,7 +13,7 @@ complete -x -c ssh -d "Remote" -a "(__fish_complete_user_at_hosts)"
# (__fish_print_users | string match -r -v '^_')@
# "
complete -c ssh -d "Command to run" -x -a '(__fish_complete_subcommand --fcs-skip=2)'
complete -c ssh -n 'test (__fish_number_of_cmd_args_wo_opts) -ge 2' -d "Command to run" -x -a '(__fish_complete_subcommand --fcs-skip=2)'
complete -c ssh -s a -d "Disables forwarding of the authentication agent"
complete -c ssh -s A -d "Enables forwarding of the authentication agent"

2
share/completions/sudo.fish
View File

@ -34,7 +34,7 @@ end
function __fish_complete_sudo_subcommand
set -l args (__fish_sudo_print_remaining_args)
set -lx -a PATH /usr/local/sbin /sbin /usr/sbin
complete -C "$args"
__fish_complete_subcommand --commandline $args
end
# All these options should be valid for GNU and OSX sudo

2
share/completions/while.fish
View File

@ -1,2 +1,2 @@
complete -c while -s h -l help -d 'Display help and exit'
complete -c while -xa '(__fish_complete_subcommand)'
complete -c while -xa '(__fish_complete_subcommand --allow-functions-and-builtins)'

73
share/functions/__fish_complete_subcommand.fish
View File

@ -1,45 +1,58 @@
function __fish_complete_subcommand -d "Complete subcommand" --no-scope-shadowing
# Pass --commandline to complete the remainder of the arguments instead of the commandline.
# Pass --allow-functions-and-builtins to enable the completion of the first token as function or builtin.
# Other args are considered flags to the supercommand that require an option.
# How many non-option tokens we skip in the input commandline before completing the subcommand
# Usually 1; for ssh 2.
set -l skip_next 1
set -l test
switch "$argv[1]"
case '--fcs-skip=*'
set -l rest
string replace -a = ' ' -- $argv[1] | read test skip_next
set -e argv[1]
end
set -l res ""
set -l had_cmd 0
set -l cmd (commandline -cop) (commandline -ct)
for i in $cmd
if test $skip_next -gt 0
set skip_next (math $skip_next - 1)
continue
set -l allow_functions_and_builtins false
set -l subcommand
while string match -rq -- '^--[a-z]' $argv[1]
set -l arg $argv[1]
set -e argv[1]
switch $arg
case '--fcs-skip=*'
set skip_next (string split = -- $arg)[2]
case '--allow-functions-and-builtins'
set allow_functions_and_builtins true
case '--commandline'
set subcommand $argv
set -e argv
break
end
end
set -l options_with_param $argv
if test "$had_cmd" = 1
set res "$res $i"
else
if contains -- $i $argv
if not string length -q $subcommand
set cmd (commandline -cop) (commandline -ct)
while set -q cmd[1]
set -l token $cmd[1]
set -e cmd[1]
if contains -- $token $options_with_param
set skip_next (math $skip_next + 1)
continue
end
switch $i
case '-*'
case '*=*'
switch $token
case '-*' '*=*'
continue
case '*'
set had_cmd 1
set res $i
if test $skip_next -gt 0
set skip_next (math $skip_next - 1)
continue
end
# found the start of our command
set subcommand $token $cmd
break
end
end
end
printf "%s\n" (complete -C "$res")
if test $allow_functions_and_builtins = false && test (count $subcommand) -eq 1
__fish_complete_external_command
else
printf "%s\n" (complete -C "$subcommand")
end
end