Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tweak documentation wording to include non-option arguments

Browse source
This commit is contained in:
Johannes Altmanninger 2021-05-16 20:47:05 +02:00
parent e714ce238e
commit e10cab8104
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc_src/cmds/complete.rst
View file

@ -13,7 +13,7 @@ Synopsis
[( -e | --erase )] [( -e | --erase )]
[( -s | --short-option ) SHORT_OPTION]... [( -s | --short-option ) SHORT_OPTION]...
[( -l | --long-option | -o | --old-option ) LONG_OPTION]... [( -l | --long-option | -o | --old-option ) LONG_OPTION]...
[( -a | --arguments ) OPTION_ARGUMENTS] [( -a | --arguments ) ARGUMENTS]
[( -k | --keep-order )] [( -k | --keep-order )]
[( -f | --no-files )] [( -f | --no-files )]
[( -F | --force-files )] [( -F | --force-files )]
@ -44,9 +44,9 @@ the fish manual.
- ``-o LONG_OPTION`` or ``--old-option=LONG_OPTION`` adds an old style long option to the completions list (See below for details). - ``-o LONG_OPTION`` or ``--old-option=LONG_OPTION`` adds an old style long option to the completions list (See below for details).
- ``-a OPTION_ARGUMENTS`` or ``--arguments=OPTION_ARGUMENTS`` adds the specified option arguments to the completions list. - ``-a ARGUMENTS`` or ``--arguments=ARGUMENTS`` adds the specified option arguments to the completions list.
- ``-k`` or ``--keep-order`` keeps the order of the ``OPTION_ARGUMENTS`` instead of sorting alphabetically. Multiple ``complete`` calls with ``-k`` result in arguments of the later ones displayed first. - ``-k`` or ``--keep-order`` keeps the order of ``ARGUMENTS`` instead of sorting alphabetically. Multiple ``complete`` calls with ``-k`` result in arguments of the later ones displayed first.
- ``-f`` or ``--no-files`` says that this completion may not be followed by a filename. - ``-f`` or ``--no-files`` says that this completion may not be followed by a filename.
@ -76,9 +76,9 @@ Multiple command switches and wrapped commands can also be given to define multi
Invoking ``complete`` multiple times for the same command adds the new definitions on top of any existing completions defined for the command. Invoking ``complete`` multiple times for the same command adds the new definitions on top of any existing completions defined for the command.
When ``-a`` or ``--arguments`` is specified in conjunction with long, short, or old style options, the specified arguments are only completed as arguments for any of the specified options. If ``-a`` or ``--arguments`` is specified without any long, short, or old style options, the specified arguments are used when completing any argument to the command (except when completing an option argument that was specified with ``-r`` or ``--require-parameter``). When ``-a`` or ``--arguments`` is specified in conjunction with long, short, or old style options, the specified arguments are only completed as arguments for any of the specified options. If ``-a`` or ``--arguments`` is specified without any long, short, or old style options, the specified arguments are used when completing non-option arguments to the command (except when completing an option argument that was specified with ``-r`` or ``--require-parameter``).
Command substitutions found in ``OPTION_ARGUMENTS`` should return a newline-separated list of arguments, and each argument may optionally have a tab character followed by the argument description. Description given this way override a description given with ``-d`` or ``--description``. Command substitutions found in ``ARGUMENTS`` should return a newline-separated list of arguments, and each argument may optionally have a tab character followed by the argument description. Description given this way override a description given with ``-d`` or ``--description``.
The ``-w`` or ``--wraps`` options causes the specified command to inherit completions from another command, "wrapping" the other command. The wrapping command can also have additional completions. A command can wrap multiple commands, and wrapping is transitive: if A wraps B, and B wraps C, then A automatically inherits all of C's completions. Wrapping can be removed using the ``-e`` or ``--erase`` options. Wrapping only works for completions specified with ``-c`` or ``--command`` and are ignored when specifying completions with ``-p`` or ``--path``. The ``-w`` or ``--wraps`` options causes the specified command to inherit completions from another command, "wrapping" the other command. The wrapping command can also have additional completions. A command can wrap multiple commands, and wrapping is transitive: if A wraps B, and B wraps C, then A automatically inherits all of C's completions. Wrapping can be removed using the ``-e`` or ``--erase`` options. Wrapping only works for completions specified with ``-c`` or ``--command`` and are ignored when specifying completions with ``-p`` or ``--path``.

4
share/completions/complete.fish
View file

@ -9,14 +9,14 @@ complete -c complete -s f -l no-files -d "Don't use file completion"
complete -c complete -s F -l force-files -d "Always use file completion" complete -c complete -s F -l force-files -d "Always use file completion"
complete -c complete -s r -l require-parameter -d "Require parameter" complete -c complete -s r -l require-parameter -d "Require parameter"
complete -c complete -s x -l exclusive -d "Require parameter and don't use file completion" complete -c complete -s x -l exclusive -d "Require parameter and don't use file completion"
complete -c complete -s a -l arguments -d "Space-separated list of possible option arguments" -x complete -c complete -s a -l arguments -d "Space-separated list of possible arguments" -x
complete -c complete -s d -l description -d "Description of completion" -x complete -c complete -s d -l description -d "Description of completion" -x
complete -c complete -s e -l erase -d "Remove completion" complete -c complete -s e -l erase -d "Remove completion"
complete -c complete -s h -l help -d "Display help and exit" complete -c complete -s h -l help -d "Display help and exit"
complete -c complete -s C -l do-complete -d "Print completions for a commandline specified as a parameter" complete -c complete -s C -l do-complete -d "Print completions for a commandline specified as a parameter"
complete -c complete -s n -l condition -d "Completion only used if command has zero exit status" -x complete -c complete -s n -l condition -d "Completion only used if command has zero exit status" -x
complete -c complete -s w -l wraps -d "Inherit completions from specified command" -xa '(__fish_complete_command)' complete -c complete -s w -l wraps -d "Inherit completions from specified command" -xa '(__fish_complete_command)'
complete -c complete -s k -l keep-order -d "Keep order of option arguments instead of sorting alphabetically" complete -c complete -s k -l keep-order -d "Keep order of arguments instead of sorting alphabetically"
# Deprecated options # Deprecated options