Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small bugfixes to MakeListDict in orgcheck.vim #76

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Small bugfixes to MakeListDict in orgcheck.vim #76

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 60 additions & 56 deletions autoload/orgcheck.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function! s:AmtDone(lineno) dict
"use list_dict structure to calculate
"use list_dict structure to calculate
"amount done for node at lineno
let mysum = 0
let mycount = 0
Expand All @@ -10,10 +10,10 @@ function! s:AmtDone(lineno) dict
else
" sum vals for this item's immediate children
for item in self[a:lineno].c
if get(self[item],'ckbox') == 1
let mysum += (get(self[item],'ckval',' ') == 'X')
let mycount += 1
endif
if get(self[item],'ckbox') == 1
let mysum += (get(self[item],'ckval',' ') == 'X')
let mycount += 1
endif
endfor
endif
return [ mysum , mycount ]
Expand All @@ -23,16 +23,16 @@ function! orgcheck#ToggleCheck()
call s:MakeListDict()
let linetext = getline(line('.'))
let curval = matchstr(linetext,' \[\zs.\ze\]')
let has_checkbox = match(linetext, '^\s* [-\+\*] \[.\]') > -1
let has_checkbox = match(linetext, '^\s* [-\+\*] \[.\]') > -1
if curval == 'X'
call s:ClearCheck()
elseif !has_checkbox
" give this list item a checkbox if it has none
" give this list item a checkbox if it has none
let part1 = matchstr(linetext,'^\s* [-\+\*] ')
let part2 = matchstr(linetext,'^\s* [-\+\*] \zs.*')
call setline(line('.'),part1 . '[ ] ' . part2)
" need to redo dict after checkbox added
call s:MakeListDict()
call setline(line('.'),part1 . '[ ] ' . part2)
" need to redo dict after checkbox added
call s:MakeListDict()
else
call s:SetCheck()
endif
Expand Down Expand Up @@ -74,12 +74,12 @@ function! s:UpdateCheckSummaries(...)
if a:0 > 0 | let lineno = a:1 | endif
let save_pos = getpos('.')
let this_line = line('.')
func! s:CheckCompare(i1, i2)
func! s:CheckCompare(i1, i2)
return a:i2 - a:i1
endfunc
" get reversed list of lines
let list_lines = copy(sort(keys(g:list_dict),"s:CheckCompare"))
if a:0 > 0
if a:0 > 0
call s:UpdateListLine(key)
else
for key in list_lines
Expand All @@ -90,7 +90,7 @@ function! s:UpdateCheckSummaries(...)
endfunction

function! s:DoHeadingUpdate()
exec 'let lineno =<SNR>' . g:org_sid . '_OrgGetHead()'
exec 'let lineno =<SNR>' . g:org_sid . '_OrgGetHead()'
if lineno == 0 | return | endif
exec lineno
" delete existing stats, if any
Expand All @@ -104,16 +104,16 @@ endfunction
function! s:UpdateListLine(key)
let key = a:key
if str2nr(key) > 0
let parent = get(g:list_dict[key], 'p', 0)
if parent > 0
call s:UpdateListLine(parent)
endif
let parent = get(g:list_dict[key], 'p', 0)
if parent > 0
call s:UpdateListLine(parent)
endif
endif
if key == 'AmtDone' | return | endif
if key == '0'
" put amtdone on heading and return
" put amtdone on heading and return
call s:DoHeadingUpdate()
return
return
else
exec key
endif
Expand All @@ -125,61 +125,65 @@ function! s:UpdateListLine(key)
if match(new_summary,'\/[01]\]') > -1 | return | endif
exec 's/$/' . new_summary . '/'
if stats[0] == 0
exec 's/\[\zs.\ze\]/ /e'
let g:list_dict[key].ckval = ' '
exec 's/\[\zs.\ze\]/ /e'
let g:list_dict[key].ckval = ' '
elseif stats[0] == stats[1]
exec 's/\[\zs.\ze\]/X/e'
let g:list_dict[key].ckval = 'X'
exec 's/\[\zs.\ze\]/X/e'
let g:list_dict[key].ckval = 'X'
else
exec 's/\[\zs.\ze\]/-/e'
let g:list_dict[key].ckval = '-'
exec 's/\[\zs.\ze\]/-/e'
let g:list_dict[key].ckval = '-'
endif
endfunction

function! s:MakeListDict()
let save_pos = getpos('.')
let list_dict = {'AmtDone':function('s:AmtDone'), 0:{'c':[], 'indent':0}}
let list_pat = '^\s* [-\+\*] *'
let list_pat = '^\s* [-\+\*] *'
let item_stack = [ 0 ]
let last_indent = 0
let this_indent = 0

?\(^\s*$\|^\*\)?+1
while 1
let lineno = line('.')
let linetext = getline(lineno)
let lineno = line('.')
let linetext = getline(lineno)
let start_indent = len(matchstr(linetext, list_pat))
let is_list_item = match(linetext, list_pat) > -1
let has_checkbox = match(linetext, '^\s* [-\+\*] \[.\]') > -1
if (linetext =~ '^\s*$')
break
elseif is_list_item
let list_dict[lineno] = { 'ckbox':has_checkbox, 'c':[] }
let this_indent = len(matchstr(linetext, list_pat))
let list_dict[lineno].indent = this_indent
if this_indent < start_indent
let is_list_item = match(linetext, list_pat) > -1
let has_checkbox = match(linetext, '^\s* [-\+\*] \[.\]') > -1

if (linetext =~ '^\s*$')
break
elseif is_list_item
let list_dict[lineno] = { 'ckbox':has_checkbox, 'c':[] }
let this_indent = len(matchstr(linetext, list_pat))
let list_dict[lineno].indent = this_indent
if this_indent < start_indent
break
endif
if has_checkbox && (matchstr(linetext,'^\s* [-\+\*] [\zsX\ze') == 'X')
if has_checkbox && (matchstr(linetext,'^\s* [-\+\*] [\zsX\ze') == 'X')
let list_dict[lineno].ckval = 'X'
endif
if this_indent > last_indent
let list_dict[lineno].p = item_stack[-1]
call add(list_dict[item_stack[-1]].c, lineno)
call add(item_stack, lineno)
elseif this_indent <= last_indent
while list_dict[item_stack[-1]].indent > this_indent
unlet item_stack[-1]
endwhile
let item_stack[-1] = lineno
let list_dict[lineno].p = item_stack[-2]
call add(list_dict[item_stack[-2]].c, lineno)
endif
endif
let last_indent = this_indent
exec lineno + 1
if this_indent > last_indent
let list_dict[lineno].p = item_stack[-1]
call add(list_dict[item_stack[-1]].c, lineno)
call add(item_stack, lineno)
elseif this_indent <= last_indent
while list_dict[item_stack[-1]].indent > this_indent
unlet item_stack[-1]
endwhile
let item_stack[-1] = lineno
let list_dict[lineno].p = item_stack[-2]
call add(list_dict[item_stack[-2]].c, lineno)
endif
endif
let last_indent = this_indent
if (lineno == line('$'))
break
endif
call setpos('.', [0, lineno + 1, 1, 0])
endwhile
let g:list_dict = list_dict
call setpos('.', save_pos)
let g:list_dict = list_dict
call setpos('.', save_pos)
endfunction