eric/todo.txt-vim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix exception in todo#MarkAsDone and todo#UnMarkAsDone

Browse Source
This commit is contained in:
fretep
2017-09-22 23:33:18 +10:00
parent 6777558646
commit 21908548d4
2 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/todo.vim
View File

@@ -91,14 +91,14 @@ function! todo#UnMarkAsDone(status)
let pat=' '.a:status let pat=' '.a:status
endif endif
exec ':s/\C^x\s*\d\{4}-\d\{1,2}-\d\{1,2}'.pat.'\s*//g' exec ':s/\C^x\s*\d\{4}-\d\{1,2}-\d\{1,2}'.pat.'\s*//g'
silent s/\C\(.*\) pri:\([A-Z]\)/(\2) \1/ silent s/\C\(.*\) pri:\([A-Z]\)/(\2) \1/e
endfunction endfunction
function! todo#MarkAsDone(status) function! todo#MarkAsDone(status)
if a:status!='' if a:status!=''
exec 'normal! I'.a:status.' ' exec 'normal! I'.a:status.' '
endif endif
exec ':s/\C^(\([A-Z]\))\(.*\)/\2 pri:\1' exec ':s/\C^(\([A-Z]\))\(.*\)/\2 pri:\1/e'
call todo#PrependDate() call todo#PrependDate()
if (getline(".") =~ '^ ') if (getline(".") =~ '^ ')
normal! gIx normal! gIx

62
tests/todo.vader
View File

@@ -445,12 +445,6 @@ Execute (2017-09-30 should NOT match with reference 2017-09-30):
" function! todo#ToggleMarkAsDone(status) {{{2 " function! todo#ToggleMarkAsDone(status) {{{2
" NOTES:
" - Rules on leading whitespace is not clear, and really could be taken
" either way. Current behaviour is to treat leading whitespace as valid.
" TODO: Ensure behavior of leading whitespace is consistent for everything
" including priorities (which are currently not).
" - FIXME: Incorrect handling of priorities is expected below, see #21.
Given todo (Tasks): Given todo (Tasks):
x 2017-09-18 Complete task x 2017-09-18 Complete task
x 2017-09-18 2017-09-01 Completed task with a created date x 2017-09-18 2017-09-01 Completed task with a created date
@@ -463,10 +457,10 @@ Given todo (Tasks):
(C) 2017-09-01 Active priority task with a created date (C) 2017-09-01 Active priority task with a created date
X 2017-09-18 Not to be confused for a complete task X 2017-09-18 Not to be confused for a complete task
XNot to be confused for a complete task XNot to be confused for a complete task
x 2017-09-18 Rules are not clear on leading whitespace, see comments in test x 2017-09-18 Leading whitespace is not valid
Tricky incomplete task x 2017-09-18 Tricky incomplete task x 2017-09-18
Execute (Toggle completed): Execute (Toggle completed):
global/./call todo#ToggleMarkAsDone('') :global/./call todo#ToggleMarkAsDone('')
execute "%substitute/" . strftime("%Y-%m-%d") . "/**TODAY**/" execute "%substitute/" . strftime("%Y-%m-%d") . "/**TODAY**/"
Expect todo (Toggled tasks with today as **TODAY**): Expect todo (Toggled tasks with today as **TODAY**):
Complete task Complete task
@@ -480,8 +474,31 @@ Expect todo (Toggled tasks with today as **TODAY**):
x **TODAY** 2017-09-01 Active priority task with a created date pri:C x **TODAY** 2017-09-01 Active priority task with a created date pri:C
x **TODAY** X 2017-09-18 Not to be confused for a complete task x **TODAY** X 2017-09-18 Not to be confused for a complete task
x **TODAY** XNot to be confused for a complete task x **TODAY** XNot to be confused for a complete task
x **TODAY** x 2017-09-18 Rules are not clear on leading whitespace, see comments in test x **TODAY** x 2017-09-18 Leading whitespace is not valid
x **TODAY** Tricky incomplete task x 2017-09-18 x **TODAY** Tricky incomplete task x 2017-09-18
Execute (Toggle twice):
:global/./call todo#ToggleMarkAsDone('')
:global/./call todo#ToggleMarkAsDone('')
execute "%substitute/" . strftime("%Y-%m-%d") . "/**TODAY**/"
Expect todo (Tasks, completed on today):
x **TODAY** Complete task
x **TODAY** 2017-09-01 Completed task with a created date
x **TODAY** Completed priority task pri:A
x **TODAY** 2017-09-01 (A) Completed priority task with a created date
X 2017-09-18 Not to be confused for a complete task
Active task
2017-09-01 Active task with a created date
(A) Active priority task
(C) 2017-09-01 Active priority task with a created date
X 2017-09-18 Not to be confused for a complete task
XNot to be confused for a complete task
x 2017-09-18 Leading whitespace is not valid
Tricky incomplete task x 2017-09-18
" The tests above use :global/ to run todo#ToggleMarkAsDone on every line, this
" is because Vader seems to have an issue with updating the line using %,
" however, using global avoids catching exceptions, whereas % gets them.
Execute (Check todo#ToggleMarkAsDone for exceptions):
:%call todo#ToggleMarkAsDone('')
" function: todo#SortDue() {{{2 " function: todo#SortDue() {{{2
@@ -759,18 +776,21 @@ Given todo (Tasks):
xinvalid due:2059-01-01 L:09 xinvalid due:2059-01-01 L:09
Xinvalid due:2059-01-01 L:10 Xinvalid due:2059-01-01 L:10
active due:2059-01-01 L:11 active due:2059-01-01 L:11
Execute (Check folding): Execute (Check folding level):
AssertEqual TodoFoldLevel(1), 0 AssertEqual foldlevel(1), 0, 'L:01'
AssertEqual TodoFoldLevel(2), 1 AssertEqual foldlevel(2), 1, 'L:02'
AssertEqual TodoFoldLevel(3), 1 AssertEqual foldlevel(3), 1, 'L:03'
AssertEqual TodoFoldLevel(4), 1 AssertEqual foldlevel(4), 1, 'L:04'
AssertEqual TodoFoldLevel(5), 0 AssertEqual foldlevel(5), 0, 'L:05'
AssertEqual TodoFoldLevel(6), 0 AssertEqual foldlevel(6), 0, 'L:06'
AssertEqual TodoFoldLevel(7), 1 AssertEqual foldlevel(7), 1, 'L:07'
AssertEqual TodoFoldLevel(8), 0 AssertEqual foldlevel(8), 0, 'L:08'
AssertEqual TodoFoldLevel(9), 0 AssertEqual foldlevel(9), 0, 'L:09'
AssertEqual TodoFoldLevel(10), 0 AssertEqual foldlevel(10), 0, 'L:10'
AssertEqual TodoFoldLevel(11), 0 AssertEqual foldlevel(11), 0, 'L:11'
Execute (Check folding text):
AssertEqual foldtextresult(2), '+- 3 Completed tasks '
AssertEqual foldtextresult(4), '+- 1 Completed tasks '
"}}} "}}}