Update clap to version 4 (casey#1924)

begoon · May 15, 2024 · caace0a · caace0a
1 parent b855400
commit caace0a
Show file tree

Hide file tree

Showing 19 changed files with 499 additions and 377 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,8 @@ ansi_term = "0.12.0"
 atty = "0.2.0"
 blake3 = { version = "1.5.0", features = ["rayon", "mmap"] }
 camino = "1.0.4"
-clap = { version = "2.33.0", features = ["wrap_help"] }
+clap = { version = "4.0.0", features = ["env", "wrap_help"] }
+clap_complete = "4.0.0"
 ctrlc = { version = "3.1.1", features = ["termination"] }
 derivative = "2.0.0"
 dirs = "5.0.1"

diff --git a/completions/just.bash b/completions/just.bash
@@ -1,5 +1,5 @@
 _just() {
-    local i cur prev words cword opts cmds
+    local i cur prev words cword opts cmd
     COMPREPLY=()
 
     # Modules use "::" as the separator, which is considered a wordbreak character in bash.
@@ -19,19 +19,18 @@ _just() {
 
     for i in ${words[@]}
     do
-        case "${i}" in
-            "$1")
+        case "${cmd},${i}" in
+            ",$1")
                 cmd="just"
                 ;;
-
             *)
                 ;;
         esac
     done
 
     case "${cmd}" in
-        just)
-            opts=" -n -q -u -v -e -l -h -V -f -d -c -s -E  --check --yes --dry-run --highlight --no-aliases --no-deps --no-dotenv --no-highlight --quiet --shell-command --clear-shell-args --unsorted --unstable --verbose --changelog --choose --dump --edit --evaluate --fmt --init --list --summary --variables --help --version --chooser --color --command-color --dump-format --list-heading --list-prefix --justfile --set --shell --shell-arg --working-directory --command --completions --show --dotenv-filename --dotenv-path  <ARGUMENTS>... "
+        "$1")
+            opts="-n -f -q -u -v -d -c -e -l -s -E -h -V --check --chooser --color --command-color --yes --dry-run --dump-format --highlight --list-heading --list-prefix --no-aliases --no-deps --no-dotenv --no-highlight --justfile --quiet --set --shell --shell-arg --shell-command --clear-shell-args --unsorted --unstable --verbose --working-directory --changelog --choose --command --completions --dump --edit --evaluate --fmt --init --list --show --summary --variables --dotenv-filename --dotenv-path --help --version [ARGUMENTS]..."
                 if [[ ${cur} == -* ]] ; then
                     COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                     return 0
@@ -53,7 +52,6 @@ _just() {
                     fi
                 fi
             case "${prev}" in
-
                 --chooser)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
@@ -82,7 +80,7 @@ _just() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                    -f)
+                -f)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
@@ -102,27 +100,27 @@ _just() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                    -d)
+                -d)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
                 --command)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                    -c)
+                -c)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
                 --completions)
-                    COMPREPLY=($(compgen -W "zsh bash fish powershell elvish" -- "${cur}"))
+                    COMPREPLY=($(compgen -W "bash elvish fish powershell zsh" -- "${cur}"))
                     return 0
                     ;;
                 --show)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                    -s)
+                -s)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
@@ -134,7 +132,7 @@ _just() {
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
-                    -E)
+                -E)
                     COMPREPLY=($(compgen -f "${cur}"))
                     return 0
                     ;;
@@ -145,8 +143,11 @@ _just() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-
     esac
 }
 
-complete -F _just -o bashdefault -o default just
+if [[ "${BASH_VERSINFO[0]}" -eq 4 && "${BASH_VERSINFO[1]}" -ge 4 || "${BASH_VERSINFO[0]}" -gt 4 ]]; then
+    complete -F _just -o nosort -o bashdefault -o default just
+else
+    complete -F _just -o bashdefault -o default just
+fi
diff --git a/completions/just.elvish b/completions/just.elvish
@@ -1,18 +1,21 @@
-edit:completion:arg-completer[just] = [@words]{
-    fn spaces [n]{
-        repeat $n ' ' | joins ''
+use builtin;
+use str;
+
+set edit:completion:arg-completer[just] = {|@words|
+    fn spaces {|n|
+        builtin:repeat $n ' ' | str:join ''
     }
-    fn cand [text desc]{
-        edit:complex-candidate $text &display-suffix=' '(spaces (- 14 (wcswidth $text)))$desc
+    fn cand {|text desc|
+        edit:complex-candidate $text &display=$text' '(spaces (- 14 (wcswidth $text)))$desc
     }
-    command = 'just'
-    for word $words[1:-1] {
-        if (has-prefix $word '-') {
+    var command = 'just'
+    for word $words[1..-1] {
+        if (str:has-prefix $word '-') {
             break
         }
-        command = $command';'$word
+        set command = $command';'$word
     }
-    completions = [
+    var completions = [
         &'just'= {
             cand --chooser 'Override binary invoked by `--choose`'
             cand --color 'Print colorful output'
@@ -65,10 +68,10 @@ edit:completion:arg-completer[just] = [@words]{
             cand --list 'List available recipes and their arguments'
             cand --summary 'List names of available recipes'
             cand --variables 'List names of variables'
-            cand -h 'Print help information'
-            cand --help 'Print help information'
-            cand -V 'Print version information'
-            cand --version 'Print version information'
+            cand -h 'Print help'
+            cand --help 'Print help'
+            cand -V 'Print version'
+            cand --version 'Print version'
         }
     ]
     $completions[$command]

diff --git a/completions/just.fish b/completions/just.fish
@@ -35,45 +35,45 @@ complete -c just -n "__fish_is_first_arg" --no-files
 complete -c just -a '(__fish_just_complete_recipes)'
 
 # autogenerated completions
-complete -c just -n "__fish_use_subcommand" -l chooser -d 'Override binary invoked by `--choose`'
-complete -c just -n "__fish_use_subcommand" -l color -d 'Print colorful output' -r -f -a "auto always never"
-complete -c just -n "__fish_use_subcommand" -l command-color -d 'Echo recipe lines in <COMMAND-COLOR>' -r -f -a "black blue cyan green purple red yellow"
-complete -c just -n "__fish_use_subcommand" -l dump-format -d 'Dump justfile as <FORMAT>' -r -f -a "just json"
-complete -c just -n "__fish_use_subcommand" -l list-heading -d 'Print <TEXT> before list'
-complete -c just -n "__fish_use_subcommand" -l list-prefix -d 'Print <TEXT> before each list item'
-complete -c just -n "__fish_use_subcommand" -s f -l justfile -d 'Use <JUSTFILE> as justfile'
-complete -c just -n "__fish_use_subcommand" -l set -d 'Override <VARIABLE> with <VALUE>'
-complete -c just -n "__fish_use_subcommand" -l shell -d 'Invoke <SHELL> to run recipes'
-complete -c just -n "__fish_use_subcommand" -l shell-arg -d 'Invoke shell with <SHELL-ARG> as an argument'
-complete -c just -n "__fish_use_subcommand" -s d -l working-directory -d 'Use <WORKING-DIRECTORY> as working directory. --justfile must also be set'
-complete -c just -n "__fish_use_subcommand" -s c -l command -d 'Run an arbitrary command with the working directory, `.env`, overrides, and exports set'
-complete -c just -n "__fish_use_subcommand" -l completions -d 'Print shell completion script for <SHELL>' -r -f -a "zsh bash fish powershell elvish"
-complete -c just -n "__fish_use_subcommand" -s s -l show -d 'Show information about <RECIPE>'
-complete -c just -n "__fish_use_subcommand" -l dotenv-filename -d 'Search for environment file named <DOTENV-FILENAME> instead of `.env`'
-complete -c just -n "__fish_use_subcommand" -s E -l dotenv-path -d 'Load <DOTENV-PATH> as environment file instead of searching for one'
-complete -c just -n "__fish_use_subcommand" -l check -d 'Run `--fmt` in \'check\' mode. Exits with 0 if justfile is formatted correctly. Exits with 1 and prints a diff if formatting is required.'
-complete -c just -n "__fish_use_subcommand" -l yes -d 'Automatically confirm all recipes.'
-complete -c just -n "__fish_use_subcommand" -s n -l dry-run -d 'Print what just would do without doing it'
-complete -c just -n "__fish_use_subcommand" -l highlight -d 'Highlight echoed recipe lines in bold'
-complete -c just -n "__fish_use_subcommand" -l no-aliases -d 'Don\'t show aliases in list'
-complete -c just -n "__fish_use_subcommand" -l no-deps -d 'Don\'t run recipe dependencies'
-complete -c just -n "__fish_use_subcommand" -l no-dotenv -d 'Don\'t load `.env` file'
-complete -c just -n "__fish_use_subcommand" -l no-highlight -d 'Don\'t highlight echoed recipe lines in bold'
-complete -c just -n "__fish_use_subcommand" -s q -l quiet -d 'Suppress all output'
-complete -c just -n "__fish_use_subcommand" -l shell-command -d 'Invoke <COMMAND> with the shell used to run recipe lines and backticks'
-complete -c just -n "__fish_use_subcommand" -l clear-shell-args -d 'Clear shell arguments'
-complete -c just -n "__fish_use_subcommand" -s u -l unsorted -d 'Return list and summary entries in source order'
-complete -c just -n "__fish_use_subcommand" -l unstable -d 'Enable unstable features'
-complete -c just -n "__fish_use_subcommand" -s v -l verbose -d 'Use verbose output'
-complete -c just -n "__fish_use_subcommand" -l changelog -d 'Print changelog'
-complete -c just -n "__fish_use_subcommand" -l choose -d 'Select one or more recipes to run using a binary chooser. If `--chooser` is not passed the chooser defaults to the value of $JUST_CHOOSER, falling back to `fzf`'
-complete -c just -n "__fish_use_subcommand" -l dump -d 'Print justfile'
-complete -c just -n "__fish_use_subcommand" -s e -l edit -d 'Edit justfile with editor given by $VISUAL or $EDITOR, falling back to `vim`'
-complete -c just -n "__fish_use_subcommand" -l evaluate -d 'Evaluate and print all variables. If a variable name is given as an argument, only print that variable\'s value.'
-complete -c just -n "__fish_use_subcommand" -l fmt -d 'Format and overwrite justfile'
-complete -c just -n "__fish_use_subcommand" -l init -d 'Initialize new justfile in project root'
-complete -c just -n "__fish_use_subcommand" -s l -l list -d 'List available recipes and their arguments'
-complete -c just -n "__fish_use_subcommand" -l summary -d 'List names of available recipes'
-complete -c just -n "__fish_use_subcommand" -l variables -d 'List names of variables'
-complete -c just -n "__fish_use_subcommand" -s h -l help -d 'Print help information'
-complete -c just -n "__fish_use_subcommand" -s V -l version -d 'Print version information'
+complete -c just -l chooser -d 'Override binary invoked by `--choose`' -r
+complete -c just -l color -d 'Print colorful output' -r -f -a "{auto	'',always	'',never	''}"
+complete -c just -l command-color -d 'Echo recipe lines in <COMMAND-COLOR>' -r -f -a "{black	'',blue	'',cyan	'',green	'',purple	'',red	'',yellow	''}"
+complete -c just -l dump-format -d 'Dump justfile as <FORMAT>' -r -f -a "{just	'',json	''}"
+complete -c just -l list-heading -d 'Print <TEXT> before list' -r
+complete -c just -l list-prefix -d 'Print <TEXT> before each list item' -r
+complete -c just -s f -l justfile -d 'Use <JUSTFILE> as justfile' -r -F
+complete -c just -l set -d 'Override <VARIABLE> with <VALUE>' -r
+complete -c just -l shell -d 'Invoke <SHELL> to run recipes' -r
+complete -c just -l shell-arg -d 'Invoke shell with <SHELL-ARG> as an argument' -r
+complete -c just -s d -l working-directory -d 'Use <WORKING-DIRECTORY> as working directory. --justfile must also be set' -r -F
+complete -c just -s c -l command -d 'Run an arbitrary command with the working directory, `.env`, overrides, and exports set' -r
+complete -c just -l completions -d 'Print shell completion script for <SHELL>' -r -f -a "{bash	'',elvish	'',fish	'',powershell	'',zsh	''}"
+complete -c just -s s -l show -d 'Show information about <RECIPE>' -r
+complete -c just -l dotenv-filename -d 'Search for environment file named <DOTENV-FILENAME> instead of `.env`' -r
+complete -c just -s E -l dotenv-path -d 'Load <DOTENV-PATH> as environment file instead of searching for one' -r -F
+complete -c just -l check -d 'Run `--fmt` in \'check\' mode. Exits with 0 if justfile is formatted correctly. Exits with 1 and prints a diff if formatting is required.'
+complete -c just -l yes -d 'Automatically confirm all recipes.'
+complete -c just -s n -l dry-run -d 'Print what just would do without doing it'
+complete -c just -l highlight -d 'Highlight echoed recipe lines in bold'
+complete -c just -l no-aliases -d 'Don\'t show aliases in list'
+complete -c just -l no-deps -d 'Don\'t run recipe dependencies'
+complete -c just -l no-dotenv -d 'Don\'t load `.env` file'
+complete -c just -l no-highlight -d 'Don\'t highlight echoed recipe lines in bold'
+complete -c just -s q -l quiet -d 'Suppress all output'
+complete -c just -l shell-command -d 'Invoke <COMMAND> with the shell used to run recipe lines and backticks'
+complete -c just -l clear-shell-args -d 'Clear shell arguments'
+complete -c just -s u -l unsorted -d 'Return list and summary entries in source order'
+complete -c just -l unstable -d 'Enable unstable features'
+complete -c just -s v -l verbose -d 'Use verbose output'
+complete -c just -l changelog -d 'Print changelog'
+complete -c just -l choose -d 'Select one or more recipes to run using a binary chooser. If `--chooser` is not passed the chooser defaults to the value of $JUST_CHOOSER, falling back to `fzf`'
+complete -c just -l dump -d 'Print justfile'
+complete -c just -s e -l edit -d 'Edit justfile with editor given by $VISUAL or $EDITOR, falling back to `vim`'
+complete -c just -l evaluate -d 'Evaluate and print all variables. If a variable name is given as an argument, only print that variable\'s value.'
+complete -c just -l fmt -d 'Format and overwrite justfile'
+complete -c just -l init -d 'Initialize new justfile in project root'
+complete -c just -s l -l list -d 'List available recipes and their arguments'
+complete -c just -l summary -d 'List names of available recipes'
+complete -c just -l variables -d 'List names of variables'
+complete -c just -s h -l help -d 'Print help'
+complete -c just -s V -l version -d 'Print version'