mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 10:01:11 +02:00
Code Releases Activity

43043: Improve comm/sed completion

Browse source
This commit is contained in:
dana 2018-06-17 20:38:15 -05:00
parent 796637362a
commit ed2f4d6840
3 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2018-06-17 dana <dana@dana.is> 2018-06-17 dana <dana@dana.is>
* 43043: Completion/Unix/Command/_comm,
Completion/Unix/Command/_sed: Improve comm/sed completion
* 43039: Src/Modules/parameter.mdd: Mark functions_source (et al.) * 43039: Src/Modules/parameter.mdd: Mark functions_source (et al.)
for auto-loading for auto-loading

9
Completion/Unix/Command/_comm
View file

@ -1,6 +1,6 @@
#compdef comm gcomm #compdef comm gcomm
local -a args local -a args aopts=( -A '-*' )
args=( args=(
'-1[suppress lines unique to first file]' '-1[suppress lines unique to first file]'
@ -11,10 +11,13 @@ args=(
) )
if _pick_variant gnu=GNU unix --version; then if _pick_variant gnu=GNU unix --version; then
aopts=( )
args+=( args+=(
'(--nocheck-order)--check-order[check input is correctly sorted]' '(--nocheck-order)--check-order[check input is correctly sorted]'
"(--check-order)--nocheck-order[don't check input is correctly sorted]" "(--check-order)--nocheck-order[don't check input is correctly sorted]"
'--output-delimiter=:delimiter' '--output-delimiter=[specify column delimiter]:delimiter'
'--total[display summary]'
'(-z --zero-terminated)'{-z,--zero-terminated}'[use NUL as line delimiter]'
'(- : *)--version[display version information]' '(- : *)--version[display version information]'
'(- : *)--help[display help information]' '(- : *)--help[display help information]'
) )
@ -24,4 +27,4 @@ elif [[ $OSTYPE = (openbsd|netbsd)* ]]; then
args+=( '-f[case insensitive comparison of lines]' ) args+=( '-f[case insensitive comparison of lines]' )
fi fi
_arguments -s $args _arguments -s -S $aopts : $args

21
Completion/Unix/Command/_sed
View file

@ -1,11 +1,12 @@
#compdef sed gsed psed s2p #compdef sed gsed psed s2p
local args inplace extended local inplace extended
local -a args aopts=( -A '-*' )
args=( args=(
'(-n --quiet --silent)'{-n,--quiet,--silent}'[suppress automatic printing of pattern space]' '(-n --quiet --silent)'{-n,--quiet,--silent}'[suppress automatic printing of pattern space]'
'(1)*'{-e,--expression=-}'[specify sed commands to run]:sed script' '(1)*'{-e+,--expression=}'[specify sed commands to run]:sed script'
'(1)*'{-f,--file=-}'[add contents of file to commands to run]:file:_files' '(1)*'{-f+,--file=}'[add contents of file to commands to run]: :_files'
'(-e)1: :_guard "^-*" sed script' '(-e)1: :_guard "^-*" sed script'
'*:input file:_files' '*:input file:_files'
) )
@ -18,11 +19,12 @@ if [[ $service = (psed|s2p) ]]; then
'-a[delay opening files listed with w function]' '-a[delay opening files listed with w function]'
) )
elif _pick_variant gnu=GNU unix --version; then elif _pick_variant gnu=GNU unix --version; then
aopts=( )
args+=( args+=(
'--follow-symlinks[follow symlinks when processing in place]' '--follow-symlinks[follow symlinks when processing in place]'
'(-i --in-place)'{-i-,--in-place=-}$inplace '(-i --in-place)'{-i+,--in-place=}$inplace
'(-c --copy)'{-c,--copy}'[copy instead of rename when shuffling files in in-place mode]' '(-c --copy)'{-c,--copy}'[copy instead of rename when shuffling files in in-place mode]'
'(-l --line-length)'{-l,--line-length=-}'[specify line-wrap length for the l command]' '(-l --line-length)'{-l+,--line-length=}'[specify line-wrap length for the l command]'
'(-r)--posix[disable GNU extensions]' '(-r)--posix[disable GNU extensions]'
'(-E -r --regexp-extended)'{-E,-r,--regexp-extended}$extended '(-E -r --regexp-extended)'{-E,-r,--regexp-extended}$extended
'(-s --separate)'{-s,--separate}'[consider files separately instead of as a combined stream]' '(-s --separate)'{-s,--separate}'[consider files separately instead of as a combined stream]'
@ -37,20 +39,21 @@ else
case $OSTYPE in case $OSTYPE in
openbsd*|freebsd*|netbsd*|darwin*|dragonfly*) openbsd*|freebsd*|netbsd*|darwin*|dragonfly*)
args+=( args+=(
'(-r -E)'{-r,-E}$extended '(-r -E)'-E$extended
'-a[delay opening files listed with w function]' '-a[delay opening files listed with w function]'
) )
;| ;|
darwin*|freebsd*|netbsd*|openbsd*) args+=( '-i'$inplace ) ;| openbsd*|freebsd*|netbsd*|dragonfly*) args+=( '(-r -E)'-r$extended ) ;|
darwin*|freebsd*|netbsd*|openbsd*) args+=( '-i+'$inplace ) ;|
darwin*|freebsd*|netbsd*) args+=( '-l[make output line buffered]' ) ;| darwin*|freebsd*|netbsd*) args+=( '-l[make output line buffered]' ) ;|
freebsd*) args+=( '-u[disable data buffering]' ) ;| freebsd*) args+=( '-u[disable data buffering]' ) ;|
freebsd*|netbsd*) freebsd*|netbsd*)
args+=( args+=(
'-I[edit files in-place, treating all files as a single input stream]::suffix for backup' '-I+[edit files in-place, treating all files as a single input stream]::suffix for backup'
) )
;; ;;
openbsd*) args+=( '-u[make output line buffered]' ) ;; openbsd*) args+=( '-u[make output line buffered]' ) ;;
esac esac
fi fi
_arguments -s "$args[@]" _arguments -s -S $aopts : "$args[@]"