mirror of
https://github.com/zsh-users/zsh-completions.git
synced 2026-09-17 16:00:19 +00:00
Updating ack & ag.
* Guard both ack & ag from completing if command doesn't exist. * Allow some opts to repeat like ignore. * Update descriptions. * Ack was missing some opts present in base 2.00. * Ag cleanup based on better understanding.
This commit is contained in:
Jeremy Pallats/starcraft.man
@@ -1,4 +1,4 @@
|
||||
#compdef ack ack-grep
|
||||
#compdef ack ack2 ack-grep ack-standalone
|
||||
# ------------------------------------------------------------------------------
|
||||
# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
|
||||
# All rights reserved.
|
||||
@@ -28,7 +28,7 @@
|
||||
# Description
|
||||
# -----------
|
||||
#
|
||||
# Completion script for ack 1.94 and 2.04 (http://betterthangrep.com).
|
||||
# Completion script for ack 1.96 and 2.14 (http://betterthangrep.com).
|
||||
#
|
||||
# ------------------------------------------------------------------------------
|
||||
# Authors
|
||||
@@ -43,39 +43,55 @@ _ack_version() {
|
||||
local version
|
||||
version=(${(f)"$(_call_program version $words[1] --version)"})
|
||||
version=${${(z)${version[1]}}[2]}
|
||||
printf $version
|
||||
echo $version
|
||||
}
|
||||
|
||||
|
||||
_ack() {
|
||||
local context curcontext="$curcontext" state line cmds update_policy ret=1
|
||||
integer NORMARG
|
||||
typeset -A opt_args
|
||||
|
||||
# Don't complete if command doesn't exist
|
||||
[[ ${+commands[${words[1]}]} -eq 0 ]] && return 0
|
||||
|
||||
zstyle -s ":completion:${curcontext}:" cache-policy update_policy
|
||||
[[ -z "$update_policy" ]] && zstyle ":completion:${curcontext}:" cache-policy _ack_types_caching_policy
|
||||
|
||||
unset _ack_raw_types
|
||||
if ( [[ ${+_ack_raw_types} -eq 0 ]] || _cache_invalid "ack-grep" ) && ! _retrieve_cache "ack-grep"; then
|
||||
|
||||
_ack_raw_types=(${(S)${(S)${(f)${${"$(_call_program types $words[1] --help=types)"}#*--\[no\]}}%; first line matches \/*\/}#*no\]})
|
||||
[[ $#_ack_raw_types -gt 0 ]] && _store_cache "ack-grep" _ack_raw_types
|
||||
fi
|
||||
|
||||
ack_20_options=(
|
||||
'(- 1 *)--dump[Writes the list of options loaded and where they came from to standard output]'
|
||||
'(- 1 *)--create-ackrc[create custom ackrc files based on the default settings loaded by ackr]'
|
||||
ack_20_options=(
|
||||
'--ackrc[specify an ackrc file to use]:files:_files'
|
||||
'(- 1 *)--bar[consult Admiral Ackbar]'
|
||||
'(--nobreak --break)'{--nobreak,--break}'[print a break between results from different files, default on]'
|
||||
'(- 1 *)--cathy[chocolate chocolate chocolate]'
|
||||
'(- 1 *)--create-ackrc[create custom ackrc files based on the default settings loaded by ackrc]'
|
||||
'(- 1 *)--dump[writes the list of options loaded and where they came from to standard output]'
|
||||
'(--files-from -x)--files-from=[read the list of files to search from FILE]:files:_files'
|
||||
'(--filter --nofilter)--filter[force ack to treat input as pipe]'
|
||||
'(--filter --nofilter)--nofilter[force ack to treat input as tty]'
|
||||
'(--noheading --heading)'{--noheading,--heading}'[print a filename heading above results, default on]'
|
||||
'(- 1 *)--help-types[display all known types]'
|
||||
'--ignore-ack-defaults[ignore default definitions included with ack]'
|
||||
'*--ignore-file=[ignore file]:ignore file filter: _describe "ignore file filter" ignore_filter_opts'
|
||||
'*--file-from=[Read the list of files to search from FILE]:file:_files'
|
||||
'-s[Suppress error messages about nonexistent or unreadable files]'
|
||||
'--ignore-ack-defaults[ignore ack default options in favor of their own]'
|
||||
'(-k --known-types)'{-k,--known-types}'[include only files of types that ack recognizes]'
|
||||
'--lines=[only print line(s) NUM of each file]:number'
|
||||
'--nopager[do not send output through a pager, overrides ackrc, ACK_PAGER & ACK_PAGER_COLOR]'
|
||||
'-s[suppress error messages about nonexistent or unreadable files]'
|
||||
'(- 1 *)--thpppt[bill the cat]'
|
||||
'*--type-del[remove all filters associated with TYPE]' \
|
||||
'(-x --files-from)-x[read the list of files to search from STDIN]'
|
||||
)
|
||||
|
||||
ack_19_options=( '(-a --all -u --unrestricted)'{-a,--all}'[operate on all files, regardless of type (but still skip directories like blib, CVS, etc.)]'
|
||||
'(-u --unrestricted -a --all)'{-u,--unrestricted}'[all files and directories (including blib/, core.*, ...) are searched, nothing is skipped]'
|
||||
ack_19_options=(
|
||||
'(-a --all -u --unrestricted)'{-a,--all}'[operate on all files, regardless of type (but still skip directories like blib, CVS, etc.)]'
|
||||
'-G+[only paths matching the given regex are included in the search]:regex'
|
||||
'--invert-file-match[print/search handle files that do not match -g/-G]'
|
||||
'--invert-file-match[print/search handle files that do not match -g/-G]'
|
||||
'--line=[only print given line of each file]:number' \
|
||||
'(-u --unrestricted -a --all)'{-u,--unrestricted}'[all files and directories (including blib/, core.*, ...) are searched, nothing is skipped]'
|
||||
)
|
||||
|
||||
if (( $(_ack_version) > 2.0 )); then
|
||||
@@ -113,7 +129,6 @@ _ack() {
|
||||
'(-i --ignore-case)'{-i,--ignore-case}'[ignore case in the search strings]' \
|
||||
'*--ignore-dir=[ignore directory]:directory:_files' \
|
||||
'*--noignore-dir=[ignore directory]:directory:_files' \
|
||||
'--line=[only print given line of each file]:number' \
|
||||
'(-l --files-with-matches -L --files-without-matches)'{-l,--files-with-matches}'[only print the filenames of matching files, instead of the matching text]' \
|
||||
'(-L --files-without-matches -l --files-with-matches)'{-L,--files-without-matches}'[only print the filenames of files that do NOT match]' \
|
||||
'--match=[specify the regular expression explicitly]:regex' \
|
||||
@@ -143,15 +158,14 @@ _ack() {
|
||||
|
||||
case $state in
|
||||
args)
|
||||
if [[ CURRENT -eq NORMARG && ${+opt_args[--match]} -eq 0 ]]
|
||||
then
|
||||
if [[ CURRENT -eq NORMARG && ${+opt_args[--match]} -eq 0 ]]; then
|
||||
# If the current argument is the first non-option argument
|
||||
# and --match isn't present then a pattern is expected
|
||||
_message -e patterns 'pattern' && ret=0
|
||||
else
|
||||
_files
|
||||
fi
|
||||
;;
|
||||
;;
|
||||
colors)
|
||||
local colors; colors=(
|
||||
'black' 'on_black'
|
||||
@@ -173,7 +187,7 @@ _ack() {
|
||||
'concealed'
|
||||
)
|
||||
_describe -t 'colors' 'color' colors && ret=0
|
||||
;;
|
||||
;;
|
||||
type-defs)
|
||||
if compset -P '*='; then
|
||||
local extensions; extensions=(*.*(:e))
|
||||
@@ -181,11 +195,11 @@ _ack() {
|
||||
else
|
||||
_message -e type-name 'type name' && ret=0
|
||||
fi
|
||||
;;
|
||||
;;
|
||||
types)
|
||||
local types; types=({'','no'}${_ack_raw_types/ ##/:})
|
||||
_describe -t 'types' 'type' types
|
||||
;;
|
||||
;;
|
||||
esac
|
||||
|
||||
return ret
|
||||
@@ -203,7 +217,7 @@ _ack_types_caching_policy() {
|
||||
# Rebuild if ackrc more recent than cache.
|
||||
[[ -f ${ACKRC:-$HOME/.ackrc} && ${ACKRC:-$HOME/.ackrc} -nt "$1" ]] && return 0
|
||||
|
||||
# Rebuild if cache is older than one week.
|
||||
# Rebuild if cache is older than one week.
|
||||
local -a oldp
|
||||
oldp=( "$1"(Nmw+1) )
|
||||
(( $#oldp )) && return 0
|
||||
|
||||
Reference in New Issue
Block a user