From 8b455d28e7d4df5f4be27f906f88a70b830ef789 Mon Sep 17 00:00:00 2001 From: Fredrik Jansson Date: Mon, 23 Jan 2023 17:01:53 +0100 Subject: [PATCH 1/2] fix: Make cmd a local var in bash completion --- clap_complete/src/shells/bash.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clap_complete/src/shells/bash.rs b/clap_complete/src/shells/bash.rs index e110537e5f6..df9557611ec 100644 --- a/clap_complete/src/shells/bash.rs +++ b/clap_complete/src/shells/bash.rs @@ -22,7 +22,7 @@ impl Generator for Bash { buf, format!( "_{name}() {{ - local i cur prev opts cmds + local i cur prev opts cmd COMPREPLY=() cur=\"${{COMP_WORDS[COMP_CWORD]}}\" prev=\"${{COMP_WORDS[COMP_CWORD-1]}}\" From 3426310d8e9f3387c7c11199ca9e1478487d9786 Mon Sep 17 00:00:00 2001 From: Fredrik Jansson Date: Mon, 23 Jan 2023 19:20:09 +0100 Subject: [PATCH 2/2] fix: Bash test cases --- clap_complete/tests/snapshots/aliases.bash | 2 +- clap_complete/tests/snapshots/basic.bash | 2 +- clap_complete/tests/snapshots/feature_sample.bash | 2 +- clap_complete/tests/snapshots/quoting.bash | 2 +- clap_complete/tests/snapshots/special_commands.bash | 2 +- clap_complete/tests/snapshots/sub_subcommands.bash | 2 +- clap_complete/tests/snapshots/value_hint.bash | 2 +- clap_complete/tests/snapshots/value_terminator.bash | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/clap_complete/tests/snapshots/aliases.bash b/clap_complete/tests/snapshots/aliases.bash index 0ca8e493f5d..5eb51c82625 100644 --- a/clap_complete/tests/snapshots/aliases.bash +++ b/clap_complete/tests/snapshots/aliases.bash @@ -1,5 +1,5 @@ _my-app() { - local i cur prev opts cmds + local i cur prev opts cmd COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" diff --git a/clap_complete/tests/snapshots/basic.bash b/clap_complete/tests/snapshots/basic.bash index 70946e79ca7..b381b977b9b 100644 --- a/clap_complete/tests/snapshots/basic.bash +++ b/clap_complete/tests/snapshots/basic.bash @@ -1,5 +1,5 @@ _my-app() { - local i cur prev opts cmds + local i cur prev opts cmd COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" diff --git a/clap_complete/tests/snapshots/feature_sample.bash b/clap_complete/tests/snapshots/feature_sample.bash index 8ea49145b5a..6289845f152 100644 --- a/clap_complete/tests/snapshots/feature_sample.bash +++ b/clap_complete/tests/snapshots/feature_sample.bash @@ -1,5 +1,5 @@ _my-app() { - local i cur prev opts cmds + local i cur prev opts cmd COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" diff --git a/clap_complete/tests/snapshots/quoting.bash b/clap_complete/tests/snapshots/quoting.bash index e387c0bc52a..940dba1b03e 100644 --- a/clap_complete/tests/snapshots/quoting.bash +++ b/clap_complete/tests/snapshots/quoting.bash @@ -1,5 +1,5 @@ _my-app() { - local i cur prev opts cmds + local i cur prev opts cmd COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" diff --git a/clap_complete/tests/snapshots/special_commands.bash b/clap_complete/tests/snapshots/special_commands.bash index 31b5354aa7b..139b4d55306 100644 --- a/clap_complete/tests/snapshots/special_commands.bash +++ b/clap_complete/tests/snapshots/special_commands.bash @@ -1,5 +1,5 @@ _my-app() { - local i cur prev opts cmds + local i cur prev opts cmd COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" diff --git a/clap_complete/tests/snapshots/sub_subcommands.bash b/clap_complete/tests/snapshots/sub_subcommands.bash index 4c2573a77ab..80eed4e847f 100644 --- a/clap_complete/tests/snapshots/sub_subcommands.bash +++ b/clap_complete/tests/snapshots/sub_subcommands.bash @@ -1,5 +1,5 @@ _my-app() { - local i cur prev opts cmds + local i cur prev opts cmd COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" diff --git a/clap_complete/tests/snapshots/value_hint.bash b/clap_complete/tests/snapshots/value_hint.bash index 11fb39624fc..f92d402112d 100644 --- a/clap_complete/tests/snapshots/value_hint.bash +++ b/clap_complete/tests/snapshots/value_hint.bash @@ -1,5 +1,5 @@ _my-app() { - local i cur prev opts cmds + local i cur prev opts cmd COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" diff --git a/clap_complete/tests/snapshots/value_terminator.bash b/clap_complete/tests/snapshots/value_terminator.bash index 3b4bc730211..f9eef4c21d2 100644 --- a/clap_complete/tests/snapshots/value_terminator.bash +++ b/clap_complete/tests/snapshots/value_terminator.bash @@ -1,5 +1,5 @@ _my-app() { - local i cur prev opts cmds + local i cur prev opts cmd COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}"