Compare commits
2 Commits
archive/co
...
archive/bu
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b131b3e2d0 | ||
|
|
d2af44d8d3 |
@@ -53,6 +53,18 @@ test_todo_session 'checking TODOTXT_FINAL_FILTER' <<EOF
|
|||||||
TODO: 3 of 3 tasks shown
|
TODO: 3 of 3 tasks shown
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
#
|
||||||
|
# check the custom hiding
|
||||||
|
#
|
||||||
|
test_todo_session 'checking HIDE_CUSTOM_SUBSTITUTION' <<EOF
|
||||||
|
>>> HIDE_CUSTOM_SUBSTITUTION='[tT]h' todo.sh ls
|
||||||
|
2 aaa zzz is line should be first.
|
||||||
|
3 bbb yyy is line should be second.
|
||||||
|
1 ccc xxx is line should be ird.
|
||||||
|
--
|
||||||
|
TODO: 3 of 3 tasks shown
|
||||||
|
EOF
|
||||||
|
|
||||||
#
|
#
|
||||||
# check the filtering of TERM
|
# check the filtering of TERM
|
||||||
#
|
#
|
||||||
|
|||||||
5
todo.sh
5
todo.sh
@@ -812,8 +812,9 @@ _list() {
|
|||||||
}
|
}
|
||||||
''' \
|
''' \
|
||||||
| sed '''
|
| sed '''
|
||||||
s/'${HIDE_PROJECTS_SUBSTITUTION:-^}'//g
|
s/'"${HIDE_PROJECTS_SUBSTITUTION:-^}"'//g
|
||||||
s/'${HIDE_CONTEXTS_SUBSTITUTION:-^}'//g
|
s/'"${HIDE_CONTEXTS_SUBSTITUTION:-^}"'//g
|
||||||
|
s/'"${HIDE_CUSTOM_SUBSTITUTION:-^}"'//g
|
||||||
''' \
|
''' \
|
||||||
| eval ${TODOTXT_FINAL_FILTER} \
|
| eval ${TODOTXT_FINAL_FILTER} \
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -38,28 +38,20 @@ _todo()
|
|||||||
+*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listproj);;
|
+*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listproj);;
|
||||||
@*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listcon);;
|
@*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listcon);;
|
||||||
*) if [[ "$cur" =~ ^[0-9]+$ ]]; then
|
*) if [[ "$cur" =~ ^[0-9]+$ ]]; then
|
||||||
|
local item=$(TODOTXT_VERBOSE=0 todo.sh -@ -+ -p -x command ls "^ *${cur} " | head -n 1)
|
||||||
|
|
||||||
# Remove the (padded) task number; we prepend the
|
# Remove the (padded) task number; we prepend the
|
||||||
# user-provided $cur instead.
|
# user-provided $cur.
|
||||||
# Remove the timestamp prepended by the -t option,
|
item=${item#* }
|
||||||
# and the done date (for done tasks); there's no
|
|
||||||
# todo.txt option for that yet.
|
# Remove the timestamp prepended by the -t option;
|
||||||
# But keep priority and "x"; they're short and may
|
# there's no todo.txt option for that yet.
|
||||||
# provide useful context.
|
item=${item#[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] }
|
||||||
# Remove any trailing whitespace; the Bash
|
|
||||||
# completion inserts a trailing space itself.
|
|
||||||
# Finally, limit the output to a single line just as
|
|
||||||
# a safety check of the ls action output.
|
|
||||||
local todo=$( \
|
|
||||||
TODOTXT_VERBOSE=0 todo.sh -@ -+ -p -x command ls "^ *${cur} " | \
|
|
||||||
sed -e 's/^ *[0-9]\+ //' -e 's/\((.) \)[0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} /\1/' \
|
|
||||||
-e 's/\([xX] \)\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{1,2\}/\1/' \
|
|
||||||
-e 's/[[:space:]]*$//' \
|
|
||||||
-e '1q' \
|
|
||||||
)
|
|
||||||
# Append task text as a shell comment. This
|
# Append task text as a shell comment. This
|
||||||
# completion can be a safety check before a
|
# completion can be a safety check before a
|
||||||
# destructive todo.txt operation.
|
# destructive todo.txt operation.
|
||||||
[ "$todo" ] && COMPREPLY[0]="$cur # $todo"
|
[ "$item" ] && COMPREPLY[0]="$cur # $item"
|
||||||
return 0
|
return 0
|
||||||
else
|
else
|
||||||
return 0
|
return 0
|
||||||
|
|||||||
Reference in New Issue
Block a user