Adds cancel/push features to simple todo list

,x -> toggle task marked as canceled
,> -> toggle task marked as pushed

Also added option for marking a task as done without a timestamp
(because sometimes I mark it done way after I actually did it, but I
don't care about the timestamp, but I also don't want an incorrect
timestamp)

,d -> toggle task marked done, sans timestamp

Also improved speed of marking task done w/ timestamp by using built-in
strftime() instead of making system call to the system's date command.

Minor change to the date format.  The year portion is unecessary, and
prefer a lowercase am/pm.

Author: coderifous

vim/unpublished/simple-todo-list/ftplugin/simple-todo-list.vim

@@ -12,11 +12,11 @@ command! -buffer -complete=custom,STL_ListPagesComp -nargs=1 OpenPage call STL_O
 
 command! -buffer FindPage call fzf#run(fzf#wrap({ 'sink': function('STL_OpenPageByName'), 'source':'note page list' }))
 
-nnoremap <buffer> <silent> <Leader>m :call STL_ToggleTodoDone()<CR>
-nnoremap <buffer> <silent> <Leader>l :call STL_ToggleTodoLogged()<CR>
-nnoremap <buffer> <silent> <Leader>d :call STL_ToggleTodoDoneAndLogged()<CR>
-
+nnoremap <buffer> <silent> <Leader>d :call STL_ToggleTodoDone(0)<CR>
+nnoremap <buffer> <silent> <Leader>m :call STL_ToggleTodoDone(1)<CR>
 nnoremap <buffer> <silent> <Leader>T :call STL_ToggleSectionTitle()<CR>
+nnoremap <buffer> <silent> <Leader>x :call STL_ToggleTodoCanceled()<CR>
+nnoremap <buffer> <silent> <Leader>> :call STL_ToggleTodoPushed()<CR>
 
 nnoremap <buffer> <C-n> /^----<CR><CR>
 nnoremap <buffer> <C-p> ?^----<CR>n<CR>

vim/unpublished/simple-todo-list/plugin/simple-todo-list.vim

@@ -1,8 +1,19 @@
 command Todo :e ~/.todo
 
-function STL_ToggleTodoLogged()
-  let done_icon    = "✔"
-  let notdone_icon = "❒"
+let s:done_icon     = "✔"
+let s:notdone_icon  = "❒"
+let s:canceled_icon = "✘"
+let s:pushed_icon   = "⍄"
+
+function s:now_timestamp()
+  let timestamp = strftime("%b %e, %l:%M%p")
+  let timestamp = substitute(timestamp, "  ", " ", "g")
+  let timestamp = substitute(timestamp, "AM", "am", "")
+  let timestamp = substitute(timestamp, "PM", "pm", "")
+  return timestamp
+endfunction
+
+function STL_ToggleTodoDone(include_timestamp)
   let save_cursor  = getpos(".")
 
   " FML this didn't work for multibyte char
@@ -11,28 +22,33 @@ function STL_ToggleTodoLogged()
   normal! "lyl
   let first_char = @l
 
-  if first_char == done_icon
-    " Move to log
-    normal! dd
-    call search("DONE LOG")
-    normal! jp
+  if first_char == s:done_icon
+    " Mark as not done
+    s/ \[.*\]//e
+    execute "normal! xi".s:notdone_icon
+
+  elseif first_char == s:notdone_icon
+    " Mark as done
+    if a:include_timestamp
+      execute "normal! xi".s:done_icon." [".s:now_timestamp()."]"
+    else
+      execute "normal! xi".s:done_icon
+    endif
+
+  elseif first_char == s:canceled_icon
+    execute "normal! xi".s:notdone_icon
 
-  elseif first_char == notdone_icon
-    " Move to todo list
-    normal! dd
-    call search("TODO LIST", "b")
-    normal! jp
+  elseif first_char == s:pushed_icon
+    execute "normal! xi".s:notdone_icon
 
   else
-    " do nothing
+    execute "normal! i".s:notdone_icon." "
   end
 
   call setpos('.', save_cursor)
 endfunction
 
-function STL_ToggleTodoDone()
-  let done_icon    = "✔"
-  let notdone_icon = "❒"
+function STL_ToggleTodoCanceled()
   let save_cursor  = getpos(".")
 
   " FML this didn't work for multibyte char
@@ -41,27 +57,33 @@ function STL_ToggleTodoDone()
   normal! "lyl
   let first_char = @l
 
-  if first_char == done_icon
-    " Mark as not done
-    s/ \[.*\]//
-    execute "normal! xi".notdone_icon
-
-  elseif first_char == notdone_icon
-    " Mark as done
-    let date_command = "date ".shellescape("+%h %d, %Y %l:%M%p")
-    let timestamp = substitute(system(date_command), "\n", "", "")
-    execute "normal! xi".done_icon." [".timestamp."]"
-
+  if first_char != s:canceled_icon
+    " Mark canceled
+    execute "normal! xi".s:canceled_icon
   else
-    execute "normal! i".notdone_icon." "
+    execute "normal! xi".s:notdone_icon
   end
 
   call setpos('.', save_cursor)
 endfunction
 
-function STL_ToggleTodoDoneAndLogged()
-  call STL_ToggleTodoDone()
-  call STL_ToggleTodoLogged()
+function STL_ToggleTodoPushed()
+  let save_cursor  = getpos(".")
+
+  " FML this didn't work for multibyte char
+  " let first_char = getline('.')[col('.')-1]
+  normal! ^
+  normal! "lyl
+  let first_char = @l
+
+  if first_char != s:pushed_icon
+    " Mark canceled
+    execute "normal! xi".s:pushed_icon
+  else
+    execute "normal! xi".s:notdone_icon
+  end
+
+  call setpos('.', save_cursor)
 endfunction
 
 function STL_ToggleSectionTitle()

vim/unpublished/simple-todo-list/syntax/simple-todo-list.vim

@@ -10,16 +10,19 @@ endif
 syntax sync fromstart
 set foldmethod=syntax
 
-
 syn region simpleTodoSection start=/^[^-].\+\n----\+$/  end=/\n[^-].\+\n----\+$/me=s-1 keepend contains=simpleTodoTitle,simpleTodoBody
-syn region simpleTodoBody    start=/./ end=/__nothing_matches__/ contained fold contains=simpleTodoTaskOpen,simpleTodoTaskDone
-syn match simpleTodoTaskOpen /^ *❒ .\+$/ contained
-syn match simpleTodoTaskDone /^ *✔ .\+$/ contained
+syn region simpleTodoBody    start=/./ end=/__nothing_matches__/ contained fold contains=simpleTodoTaskOpen,simpleTodoTaskDone,simpleTodoTaskCanceled,simpleTodoTaskPushed
+syn match simpleTodoTaskOpen     /^ *❒ .\+$/ contained
+syn match simpleTodoTaskDone     /^ *✔ .\+$/ contained
+syn match simpleTodoTaskCanceled /^ *✘ .\+$/ contained
+syn match simpleTodoTaskPushed   /^ *⍄ .\+$/ contained
 syn region simpleTodoTitle   start=/^[^-].\+\n\z\(----\+$\)/ end=/^\z1/ contained
 
-hi def link simpleTodoBody Normal
-hi def link simpleTodoTitle PreProc
-hi def link simpleTodoTaskOpen Function
-hi def link simpleTodoTaskDone Type
+hi def link simpleTodoBody         Normal
+hi def link simpleTodoTitle        PreProc
+hi def link simpleTodoTaskOpen     Function
+hi def link simpleTodoTaskDone     Type
+hi def link simpleTodoTaskCanceled Comment
+hi def link simpleTodoTaskPushed   Comment
 
 let b:current_syntax = "simple-todo"