From 1c4940c04c133e434e32ca25e1366625ff1bb413 Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Thu, 17 May 2018 20:19:31 -0500 Subject: [PATCH] Make `sudo` completions _much_ smarter Now dynamically generating completions for the target of the `sudo` command, where possible. --- CHANGELOG.md | 16 +++++++++------- share/completions/sudo.fish | 27 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1865ca244..73f3f526d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,11 +32,12 @@ This section is for changes merged to the `major` branch that are not also merge - Using a read-only variable in a for loop is now an error. Note that this never worked. It simply failed to set the for loop var and thus silently produced incorrect results (#4342). - `math` is now a builtin rather than a wrapper around `bc` (#3157). - `history search` supports globs for wildcard searching (#3136). -- `bind` has a new `--silent` option to ignore bind requests for named keys not available under the current `$TERMINAL` (#4188, #4431) -- Globs are faster (#4579) -- `string` reads from stdin faster (#4610) -- `string split` supports `-n/--no-empty` to exclude empty strings from the result (#4779) -- `cd` tab completions no longer descend into the deepest unambiguous path (#4649) +- `bind` has a new `--silent` option to ignore bind requests for named keys not available under the current `$TERMINAL` (#4188, #4431). +- Globs are faster (#4579). +- `string` reads from stdin faster (#4610). +- `string split` supports `-n/--no-empty` to exclude empty strings from the result (#4779). +- `cd` tab completions no longer descend into the deepest unambiguous path (#4649). +- `sudo` completions now provide completions for the target of the sudo command. - Setting `$PATH` no longer warns on non-existent directories, allowing for a single $PATH to be shared across machines (e.g. via dotfiles). - `funced` now has a `-s` and `--save` option to automatically save the edited function after successfully editing (#4668). - Arguments to `end` are now errors, instead of being silently ignored. @@ -45,8 +46,8 @@ This section is for changes merged to the `major` branch that are not also merge - A new input binding `pager-toggle-search` toggles the search field in the completions pager on and off. By default this is bound to control-s. - Slicing $history (in particular, `$history[1]` for the last executed command) is much faster. - The pager will now show the full command instead of just its last line if the number of completions is large (#4702). -- Tildes in file names are now properly escaped in completions (#2274) -- A pipe at the end of a line now allows the job to continue on the next line (#1285) +- Tildes in file names are now properly escaped in completions (#2274). +- A pipe at the end of a line now allows the job to continue on the next line (#1285). - The names `argparse`, `read`, `set`, `status`, `test` and `[` are now reserved and not allowed as function names. This prevents users unintentionally breaking stuff (#3000). - Wrapping completions (from `complete -w` or `function -w`) can now inject arguments. For example, `complete gco -w 'git checkout'` now works properly (#1976). The `alias` function has been updated to respect this behavior. - The `jobs` builtin now has a `-q` and `--quiet` option to silence the output. @@ -77,6 +78,7 @@ This section is for changes merged to the `major` branch that are not also merge - `npm`† - `python`/`python2`/`python3` - `ssh` (#4344) + - `sudo` (see above) - `yarn`∗† ∗ _`jq` must be installed to complete the list of currently installed `bower` or `yarn` packages_.
diff --git a/share/completions/sudo.fish b/share/completions/sudo.fish index 6d5260a78..af6156220 100644 --- a/share/completions/sudo.fish +++ b/share/completions/sudo.fish @@ -24,3 +24,30 @@ complete -c sudo -s u -a "(__fish_complete_users)" -x -d "Run command as user" complete -c sudo -s v -n "__fish_no_arguments" -d "Validate the credentials, extending timeout" complete -c sudo -d "Command to run" -x -a "(__fish_complete_subcommand_root -u -g)" + +# Or provide completions +function __fish_complete_sudo_payload + set -l tokens (commandline -co) + # at least sudo and cmd + if test (count $tokens) -ge 2; \ + # and second parameter is not a flag + and string match -qr '^[^-]' -- $tokens[2] \ + # and 2nd parameter is a valid cmd + and type -q $tokens[2] + echo $tokens[2..-1] | complete -C # complete from 2nd parameter onwards + # or at least sudo, switch, and cmd + else if test (count $tokens) -ge 3; \ + # and second parameter takes no arguments + and string match -qr '^-[AEHKPSbiknsv]\b' -- $tokens[2] + # and 3rd parameter is a valid cmd + and type -q $tokens[3] + echo $tokens[3..-1] | complete -C # complete from 3rd parameter onwards + # or sudo, switch, param, and cmd + else if test (count $tokens) -ge 4; \ + # and 4th parameter is a valid cmd + and type -q $tokens[4] \ + echo $tokens[4..-1] | complete -C # complete from 4th parameter onwards + end +end + +complete -c sudo -xa '(__fish_complete_sudo_payload)'