38d25a335999753093011f93699725c865f73360
- Author
- Marc Cornellà <marc.cornella@live.com>
- Committer
- Marc Cornellà <marc.cornella@live.com>
- Date
Message
Diff
This diff is truncated to protect this page.
1diff --git a/plugins/taskwarrior/_task b/plugins/taskwarrior/_task
2index 5cc2531526e051022dcb3b411bc8a342103eb127..afa30d45a14991d459056c0d2cecd187c568c933 100644
3--- a/plugins/taskwarrior/_task
4+++ b/plugins/taskwarrior/_task
5@@ -1,9 +1,6 @@
6 #compdef task
7-# zsh completion for taskwarrior
8 #
9-# taskwarrior - a command line task list manager.
10-#
11-# Copyright 2010 - 2011 Johannes Schlatow
12+# Copyright 2010 - 2015 Johannes Schlatow
13 # Copyright 2009 P.C. Shyamshankar
14 #
15 # Permission is hereby granted, free of charge, to any person obtaining a copy
16@@ -30,31 +27,40 @@ typeset -g _task_cmds _task_projects _task_tags _task_config _task_modifiers
17 _task_projects=($(task _projects))
18 _task_tags=($(task _tags))
19 _task_ids=($(task _ids))
20+_task_zshids=( ${(f)"$(task _zshids)"} )
21 _task_config=($(task _config))
22 _task_columns=($(task _columns))
23 _task_modifiers=(
24- 'before' \
25- 'after' \
26- 'none' \
27- 'any' \
28- 'is' \
29- 'isnt' \
30- 'has' \
31- 'hasnt' \
32- 'startswith' \
33- 'endswith' \
34- 'word' \
35- 'noword'
36+ 'before' \
37+ 'after' \
38+ 'none' \
39+ 'any' \
40+ 'is' \
41+ 'isnt' \
42+ 'has' \
43+ 'hasnt' \
44+ 'startswith' \
45+ 'endswith' \
46+ 'word' \
47+ 'noword'
48 )
49 _task_conjunctions=(
50- 'and' \
51- 'or' \
52- 'xor' \
53- '\)'
54- '\('
55+ 'and' \
56+ 'or' \
57+ 'xor' \
58+ '\)' \
59+ '\(' \
60+ '<' \
61+ '<=' \
62+ '=' \
63+ '!=' \
64+ '>=' \
65+ '>'
66 )
67-_task_cmds=($(task _commands))
68-_task_zshcmds=( ${(f)"$(task _zshcommands)"} )
69+_task_cmds=($(task _commands; task _aliases))
70+_task_zshcmds=( ${(f)"$(task _zshcommands)"} sentinel:sentinel:sentinel )
71+
72+_task_aliases=($(task _aliases))
73
74 _task() {
75 _arguments -s -S \
76@@ -68,110 +74,130 @@ word=$'[^\0]#\0'
77 # priorities
78 local -a task_priorities
79 _regex_words values 'task priorities' \
80- 'H:High' \
81- 'M:Middle' \
82- 'L:Low'
83+ 'H:High' \
84+ 'M:Middle' \
85+ 'L:Low'
86 task_priorities=("$reply[@]")
87
88 # projects
89 local -a task_projects
90 task_projects=(
91- /"$word"/
92- ":values:task projects:compadd -a _task_projects"
93+ /"$word"/
94+ ":values:task projects:compadd -a _task_projects"
95 )
96
97 local -a _task_dates
98 _regex_words values 'task dates' \
99- 'tod*ay:Today' \
100- 'yes*terday:Yesterday' \
101- 'tom*orrow:Tomorrow' \
102- 'sow:Start of week' \
103- 'soww:Start of work week' \
104- 'socw:Start of calendar week' \