Integrating sietse's work, version 0.7.6

Add logic to place the completion date after the priority, if it exists,
when completing a task.

README.markdown

@@ -28,7 +28,10 @@
 
 ## Release notes
 
-v0.7.4 includes the overduedate support from Guilherme Victal (see pull
++   v0.7.6 Incorporates [Sietse's work](https://github.com/sietse/todo.txt-vim/commit/57d45200c8b033d31c9191ee0eb0711c801cdb1d) to make cancel and mark as done mapping repeatable using [vim-repeat](https://github.com/tpope/vim-repeat).
++   v0.7.5 Incorporates [Fievel's work](https://github.com/fievel/todo.txt-vim/commit/0863e1434e9a89ace06c4856b6cb32ba9906e3de) to make overduedates work on python3.
++   v0.7.4 includes the overduedate support from Guilherme Victal (see pull
+
     [request #45 on freitass version](https://github.com/freitass/todo.txt-vim/pull/45)),
     it highlight dates in overdue tasks as an Error. It depends on a
     Python library, however, and as such will only be able to work if your version
@@ -37,8 +40,7 @@ of Vim was compiled with the `+python` option (as most common versions do).
     If your Vim installation does **not** have Python support, this plugin **will work just fine** but this feature will be disabled.
 
 
-Since v0.7.3, `TodoComplete` is replaced by `todo#Complete`, you might need to
-update your vimrc (see [completion](#completion)).
++   Since v0.7.3, `TodoComplete` is replaced by `todo#Complete`, you might need to update your vimrc (see [completion](#completion)).
 
 ## Introduction
 

autoload/todo.vim

@@ -62,7 +62,11 @@ function! todo#RemovePriority()
 endfunction
 
 function! todo#PrependDate()
+    if (getline(".") =~ '\v^\(')
+	execute "normal! 0f)a\<space>\<esc>l\"=strftime(\"%Y-%m-%d\")\<esc>P"
+    else
         normal! 0"=strftime("%Y-%m-%d ")
+P
     endif
 endfunction
 
@@ -137,9 +141,28 @@ function! todo#Sort()
         silent! %s/\(x\s*\d\{4}\)-\(\d\{2}\)-\(\d\{2}\)/\1\2\3/g
         sort n /^x\s*/
         silent! %s/\(x\s*\d\{4}\)\(\d\{2}\)/\1-\2-/g
+    else
+        let oldcursor=getpos(".")
+        silent normal gg
+        let l:first=search('^\s*x')
+        if  l:first != 0
+            sort /^./r
+            " at this point done tasks are at the end
+            let l:first=search('^\s*x')
+            let l:last=search('^\s*x','b')
+            let l:diff=l:last-l:first+1
+            " Cut the done lines
+            execute ':'.l:first.'d a '.l:diff
         endif
         sort /@[a-zA-Z]*/ r
-        sort /+[a-zA-Z]*/ r
+        sort /+[a-zA-Z]*/ r
+        sort /\v([A-Z])/ r
+        if l:first != 0
+            silent normal G"ap
+            execute ':'.l:first.','.l:last.'sort /@[a-zA-Z]*/ r'
+            execute ':'.l:first.','.l:last.'sort /+[a-zA-Z]*/ r'
+            execute ':'.l:first.','.l:last.'sort /\v([A-Z])/ r'
+        endif
         call cursor(oldcursor)
     endif
 endfunction
@@ -331,7 +354,7 @@ fun! todo#Complete(findstart, base)
         let res = []
         for bufnr in range(1,bufnr('$'))
             let lines=getbufline(bufnr,1,"$")
-            for line in lines
+            for line in lines
                 if line =~ " ".a:base
                     " init temporary item
                     let item={}

doc/todo.txt

@@ -31,6 +31,12 @@ Table of Contents                                          *TodoTxt-Contents* ~
 ===============================================================================
 1. Release notes                                       *TodoTxt-ReleaseNotes* ~
 
+v0.7.6 Incorporates [Sietse's work](https://github.com/sietse/todo.txt-vim/commit/57d45200c8b033d31c9191ee0eb0711c801cdb1d) to make cancel and mark as done mapping repeatable using [vim-repeat](https://github.com/tpope/vim-repeat).
+
+v0.7.5 Incorporates Fievel's work
+(https://github.com/fievel/todo.txt-vim/commit/0863e1434e9a89ace06c4856b6cb32ba9906e3de)
+to make overduedates work on python3.
+
 v0.7.4 includes the overduedate support from Guilherme Victal (see pull
 request #45 on freitass version (https://github.com/freitass/todo.txt-vim/pull/45)),
 it highlight dates in overdue tasks as an Error. It depends on a

ftplugin/todo.vim

@@ -12,7 +12,7 @@ set cpo&vim
 if exists("g:Todo_txt_loaded")
     finish
 else
-    let g:Todo_txt_loaded=0.7.4
+    let g:Todo_txt_loaded=0.7.6
 endif
 
 " General options {{{1
@@ -54,12 +54,15 @@ if !exists("g:Todo_txt_do_not_map")
     noremap <script> <silent> <buffer> <localleader>d :call todo#PrependDate()<CR>
 
 " Mark done {{{2
-    noremap <script> <silent> <buffer> <localleader>x :call todo#ToggleMarkAsDone('')<CR>
+    noremap <script> <silent> <buffer> <Plug>DoToggleMarkAsDone :call todo#ToggleMarkAsDone('')<CR>
+                \:call repeat#set("\<Plug>DoToggleMarkAsDone")<CR>
+    nmap <localleader>x <Plug>DoToggleMarkAsDone
+    " noremap <script> <silent> <buffer> <localleader>x :call todo#ToggleMarkAsDone('')<CR>
 
 " Mark done {{{2
-    noremap <script> <silent> <buffer> <localleader>C :call todo#ToggleMarkAsDone('Cancelled')<CR>
-
-
+    noremap <script> <silent> <buffer> <Plug>DoCancel :call todo#ToggleMarkAsDone('Cancelled')<CR>
+                \:call repeat#set("\<Plug>DoCancel")<CR>
+    nmap <localleader>C <Plug>DoCancel
 
 " Mark all done {{{2
     noremap <script> <silent> <buffer> <localleader>X :call todo#MarkAllAsDone()<CR>

syntax/python/dateregex/dateregex/__init__.py

@@ -7,5 +7,5 @@
 # Website:     http://github.com/freitass/todo.txt-vim
 # Version:     0.1
 
-from after import regex_date_after
-from before import regex_date_before
+from dateregex.after import regex_date_after
+from dateregex.before import regex_date_before

syntax/python/dateregex/dateregex/before.py

@@ -44,7 +44,7 @@ def _month_regex_before(year, month):
 def _day_regex_before(year, month, day):
     if day == '01':
         return None
-    last_month_day = str((date(int(year), (int(month) + 1) % 12, 1) + - date.resolution).day)
+    last_month_day = str((date(int(year), int(month) % 12 + 1, 1) + - date.resolution).day)
     last_digit1, last_digit2 = last_month_day
 
     digit1, digit2 = day

syntax/todo.vim

@@ -51,12 +51,12 @@ highlight  default  link  TodoDate       PreProc
 highlight  default  link  TodoProject    Special
 highlight  default  link  TodoContext    Special
 
-if has('python')
 let b:curdir = expand('<sfile>:p:h')
 let s:script_dir = b:curdir . "/python/"
+if has('python3')
+    execute "py3file " . s:script_dir. "todo.py"
+elseif has('python')
     execute "pyfile " . s:script_dir. "todo.py"
-else
-    echom "Your version of vim has no python support. Overdue dates won't be highlighted"
 endif
 
 let b:current_syntax = "todo"

test/tc_date.todo.txt

@@ -1,28 +0,0 @@
-# lorem_ipsum
-example task
-# end_lorem_ipsum
-
-# date_after_priority
-(A) Call Mom
-# end_date_after_priority
-
-# date_after_priority_visual
-(A) Call Mom
-(B) Call Dad
-# end_date_after_priority_visual
-
-# existing_date_no_priority
-2014-05-06 example task
-# end_existing_date_no_priority
-
-# existing_date_after_priority
-(A) 2014-05-06 Call Mom
-# end_existing_date_after_priority
-
-# existing_date_do_nothing
-2014-05-06 example task
-# end_existing_date_do_nothing
-
-# non_existing_date_do_nothing
-new todo line
-# end_non_existing_date_do_nothing

test/tc_date.vim

@@ -1,84 +0,0 @@
-let s:here = expand('<sfile>:p:h')
-let s:context = todo#txt#__context__()
-let s:context['data'] = s:here . '/tc_date.todo.txt'
-let s:tc = unittest#testcase#new('Date', s:context)
-
-let s:TODAY = strftime("%Y-%m-%d")
-
-function! s:tc.test_current_date()
-  call self.assert_equal(s:TODAY, self.call('s:get_current_date', []))
-endfunction
-
-let s:DATE_INSERTED = [
-      \ s:TODAY . ' example task',
-      \ ]
-
-let s:DATE_INSERTED_AFTER_PRIORITY = [
-      \ '(A) ' . s:TODAY . ' Call Mom',
-      \ ]
-
-let s:DATE_INSERTED_AFTER_PRIORITY_VISUAL = [
-      \ '(A) ' . s:TODAY . ' Call Mom',
-      \ '(B) ' . s:TODAY . ' Call Dad',
-      \ ]
-
-let s:DATE_INSERTED_DO_NOTHING = [
-      \ '2014-05-06 example task',
-      \ ]
-
-let s:NON_EXISTING_DATE_INSERTED_DO_NOTHING = [
-      \ s:TODAY . ' new todo line',
-      \ ]
-
-function! s:tc.test_insert_date_normal_mode()
-  call self.data.goto('lorem_ipsum')
-  call todo#txt#replace_date()
-  call self.assert_equal(s:DATE_INSERTED, self.data.get('lorem_ipsum'))
-endfunction
-
-function! s:tc.test_insert_date_insert_mode()
-  call self.data.goto('lorem_ipsum')
-  execute 'normal idate	 '
-  call self.assert_equal(s:DATE_INSERTED, self.data.get('lorem_ipsum'))
-endfunction
-
-function! s:tc.test_insert_date_visual_mode()
-  call self.data.visual_execute('call todo#txt#replace_date()', 'lorem_ipsum')
-  call self.assert_equal(s:DATE_INSERTED, self.data.get('lorem_ipsum'))
-endfunction
-
-function! s:tc.test_insert_date_after_priority_normal_mode()
-  call self.data.execute('call todo#txt#replace_date()', 'date_after_priority')
-  call self.assert_equal(s:DATE_INSERTED_AFTER_PRIORITY, self.data.get('date_after_priority'))
-endfunction
-
-function! s:tc.test_insert_date_after_priority_visual_mode()
-  call self.data.visual_execute('call todo#txt#replace_date()', 'date_after_priority_visual')
-  call self.assert_equal(s:DATE_INSERTED_AFTER_PRIORITY_VISUAL, self.data.get('date_after_priority_visual'))
-endfunction
-
-function! s:tc.test_insert_with_existing_date()
-  call self.data.execute('call todo#txt#replace_date()', 'existing_date_no_priority')
-  call self.assert_equal(s:DATE_INSERTED, self.data.get('existing_date_no_priority'))
-endfunction
-
-function! s:tc.test_insert_with_existing_date_and_priority()
-  call self.data.execute('call todo#txt#replace_date()', 'existing_date_after_priority')
-  call self.assert_equal(s:DATE_INSERTED_AFTER_PRIORITY, self.data.get('existing_date_after_priority'))
-endfunction
-
-function! s:tc.test_insert_with_existing_date_and_priority()
-  let g:todo_existing_date = 'n'
-  call self.data.execute('call todo#txt#replace_date()', 'existing_date_do_nothing')
-  call self.assert_equal(s:DATE_INSERTED_DO_NOTHING, self.data.get('existing_date_do_nothing'))
-  unlet g:todo_existing_date
-endfunction
-
-function! s:tc.test_insert_with_existing_date_and_priority()
-  let g:todo_existing_date = 'n'
-  call self.data.execute('call todo#txt#replace_date()', 'non_existing_date_do_nothing')
-  call self.assert_equal(s:NON_EXISTING_DATE_INSERTED_DO_NOTHING, self.data.get('non_existing_date_do_nothing'))
-  unlet g:todo_existing_date
-endfunction
-
-unlet s:tc

test/tc_mark_as_done.todo.txt

@@ -1,5 +0,0 @@
-# lorem_ipsum
-first task to be marked as done
-second task to be marked as done
-2015-05-20 third task to be marked as done
-# end_lorem_ipsum

test/tc_mark_as_done.vim

@@ -1,36 +0,0 @@
-let s:here = expand('<sfile>:p:h')
-let s:context = todo#txt#__context__()
-let s:context['data'] = s:here . '/tc_mark_as_done.todo.txt'
-let s:tc = unittest#testcase#new('Mark As Done', s:context)
-
-let s:TODAY = strftime("%Y-%m-%d")
-
-let s:FIRST_TASK_DONE = [
-      \ 'x ' . s:TODAY . ' first task to be marked as done',
-      \ 'second task to be marked as done',
-      \ '2015-05-20 third task to be marked as done',
-      \ ]
-
-let s:ALL_TASKS_DONE = [
-      \ 'x ' . s:TODAY . ' first task to be marked as done',
-      \ 'x ' . s:TODAY . ' second task to be marked as done',
-      \ 'x ' . s:TODAY . ' 2015-05-20 third task to be marked as done',
-      \ ]
-
-function! s:tc.test_mark_as_done()
-  call self.data.goto('lorem_ipsum')
-  call todo#txt#mark_as_done()
-  call self.assert_equal(s:FIRST_TASK_DONE, self.data.get('lorem_ipsum'))
-endfunction
-
-function! s:tc.test_mark_range_as_done()
-  call self.data.execute('call todo#txt#mark_as_done()', 'lorem_ipsum')
-  call self.assert_equal(s:ALL_TASKS_DONE, self.data.get('lorem_ipsum'))
-endfunction
-
-function! s:tc.test_mark_selection_as_done()
-  call self.data.visual_execute('call todo#txt#mark_as_done()', 'lorem_ipsum')
-  call self.assert_equal(s:ALL_TASKS_DONE, self.data.get('lorem_ipsum'))
-endfunction
-
-unlet s:tc

test/tc_priority.todo.txt

@@ -1,7 +0,0 @@
-# insert_priority
-example task
-# end_insert_priority
-
-# replace_priority
-(A) example task
-# end_replace_priority

test/tc_priority.vim

@@ -1,28 +0,0 @@
-let s:here = expand('<sfile>:p:h')
-let s:context = todo#txt#__context__()
-let s:context['data'] = s:here . '/tc_priority.todo.txt'
-let s:tc = unittest#testcase#new('Priority', s:context)
-
-let s:TODAY = strftime("%Y-%m-%d")
-
-let s:PRIORITY_INSERTED = [
-      \ '(A) example task',
-      \ ]
-
-let s:PRIORITY_REPLACED = [
-      \ '(C) example task',
-      \ ]
-
-function! s:tc.test_insert_priority()
-  call self.data.goto('insert_priority')
-  call todo#txt#prioritize_add('A')
-  call self.assert_equal(s:PRIORITY_INSERTED, self.data.get('insert_priority'))
-endfunction
-
-function! s:tc.test_replace_priority()
-  call self.data.goto('replace_priority')
-  call todo#txt#prioritize_add('C')
-  call self.assert_equal(s:PRIORITY_REPLACED, self.data.get('replace_priority'))
-endfunction
-
-unlet s:tc

test/tc_sort_context.todo.txt

@@ -1,5 +0,0 @@
-# lorem_ipsum
-(B) Linear regression Rnet=Qh@Qle. @cons_emp_model
-(B) Review key questions. @benchmarking
-(A) simple model first @cons_emp_model
-# end_lorem_ipsum

test/tc_sort_context.vim

@@ -1,18 +0,0 @@
-let s:here = expand('<sfile>:p:h')
-let s:tc = unittest#testcase#new('Sort Context', 
-      \ { 'data': s:here . '/tc_sort_context.todo.txt' })
-
-let s:LEADER = mapleader
-
-let s:SORTED_TASKS = [
-      \ '(B) Review key questions. @benchmarking',
-      \ '(B) Linear regression Rnet=Qh@Qle. @cons_emp_model',
-      \ '(A) simple model first @cons_emp_model',
-      \ ]
-
-function! s:tc.test_sort_by_context()
-  call self.data.visual_execute('call todo#txt#sort_by_context()', 'lorem_ipsum')
-  call self.assert_equal(s:SORTED_TASKS, self.data.get('lorem_ipsum'))
-endfunction
-
-unlet s:tc

test/tc_sort_date.todo.txt

@@ -1,12 +0,0 @@
-# lorem_ipsum
-(B) 2013-03-15 2015-03-17
-(B) 2012-04-16 2015-04-16
-(A) 2013-03-16 2013-03-10
-# end_lorem_ipsum
-# task_with_no_date
-2013-03-15 task with date
-task with no date
-2013-03-15 task with date
-2013-03-15 task with date
-task with no date
-# end_task_with_no_date

test/tc_sort_date.vim

@@ -1,31 +0,0 @@
-let s:here = expand('<sfile>:p:h')
-let s:tc = unittest#testcase#new('Sort Date', 
-      \ { 'data': s:here . '/tc_sort_date.todo.txt' })
-
-let s:LEADER = mapleader
-
-let s:SORTED_TASKS = [
-      \ '(B) 2012-04-16 2015-04-16',
-      \ '(B) 2013-03-15 2015-03-17',
-      \ '(A) 2013-03-16 2013-03-10',
-      \ ]
-
-let s:SORTED_TASKS_WITH_NO_DATE = [
-      \ '2013-03-15 task with date',
-      \ '2013-03-15 task with date',
-      \ '2013-03-15 task with date',
-      \ 'task with no date',
-      \ 'task with no date',
-      \ ]
-
-function! s:tc.test_sort_by_date()
-  call self.data.visual_execute('call todo#txt#sort_by_date()', 'lorem_ipsum')
-  call self.assert_equal(s:SORTED_TASKS, self.data.get('lorem_ipsum'))
-endfunction
-
-function! s:tc.test_sort_by_date_with_tasks_without_date()
-  call self.data.visual_execute('call todo#txt#sort_by_date()', 'task_with_no_date')
-  call self.assert_equal(s:SORTED_TASKS_WITH_NO_DATE, self.data.get('task_with_no_date'))
-endfunction
-
-unlet s:tc

test/tc_sort_project.todo.txt

@@ -1,5 +0,0 @@
-# lorem_ipsum
-(B) Linear regression Rnet=Qh+Qle. +cons_emp_model
-(B) Review key questions. +benchmarking
-(A) simple model first +cons_emp_model
-# end_lorem_ipsum

test/tc_sort_project.vim

@@ -1,18 +0,0 @@
-let s:here = expand('<sfile>:p:h')
-let s:tc = unittest#testcase#new('Sort Project', 
-      \ { 'data': s:here . '/tc_sort_project.todo.txt' })
-
-let s:LEADER = mapleader
-
-let s:SORTED_TASKS = [
-      \ '(B) Review key questions. +benchmarking',
-      \ '(B) Linear regression Rnet=Qh+Qle. +cons_emp_model',
-      \ '(A) simple model first +cons_emp_model',
-      \ ]
-
-function! s:tc.test_sort_by_project()
-  call self.data.visual_execute('call todo#txt#sort_by_project()', 'lorem_ipsum')
-  call self.assert_equal(s:SORTED_TASKS, self.data.get('lorem_ipsum'))
-endfunction
-
-unlet s:tc