zsh completion: Fix completion when using docker run/exec -it shortcut
#3075
Conversation
This commit adds the -it support to any command that has both --interactive and --tty. Before, the completions plugin did not recognize the -it option and thus the subcommands completion context break whenever -it is used. Signed-off-by: Michel Heily <[email protected]>
michelhe
force-pushed
the
zsh-completion-support-it-shortcut
branch
from
4d6db5e to
ab7ae87
Compare
Codecov Report
@@ Coverage Diff @@
## master #3075 +/- ##
=======================================
Coverage 56.97% 56.97%
=======================================
Files 299 299
Lines 18731 18731
=======================================
Hits 10672 10672
Misses 7192 7192
Partials 867 867 |
| @@ -665,6 +665,7 @@ __docker_container_subcommand() { | |||
| "($help)--volume-driver=[Optional volume driver for the container]:volume driver:(local)" | |||
| "($help)*--volumes-from=[Mount volumes from the specified container]:volume: " | |||
| "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories" | |||
| "($help)-it[shortcut for --interactive and --tty]" | |||
There was a problem hiding this comment.
I don't think this would be the right thing to do, as any shorthand flag can be combined in any order (e.g. both -ti or -it can be used).
The completion script already has support for "short option stacking"; https://github.com/docker/cli/blob/master/contrib/completion/zsh/_docker#L42-L49
But it's disabled by default, because enabling this feature caused some regression for other completion; see the discussion on moby/moby#17124 (comment)
Also, related; ohmyzsh/ohmyzsh#6710 and #993
There was a problem hiding this comment.
Thanks, I wasn't aware of that.
We can close this PR, in the meantime I would use it locally for my setup. :)
This commit adds the -it support to any command that has both --interactive and --tty.
Before, the completions plugin did not recognize the -it option and thus the subcommands completion context break whenever -it is used.
- What I did
Added the
-itoption in the relevant places in the zsh plugin- How I did it
- How to verify it
on the master branch of a oh-my-zsh installation, run:
docker run -it <TAB>- the container list does not appear.now replace with the plugin from this branch:
docker run -it <TAB>- the container name completor kicks in.- Description for the changelog
fix completion for the -it option
- A picture of a cute animal (not mandatory but encouraged)