y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor ugly functions

Browse Source 
to more ugly ones ;)
This commit is contained in:
EinfachToll 2013-10-16 12:18:50 +02:00
parent 3eaaf12b2d
commit 391cbd827d
1 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
autoload/vimwiki/lst.vim
View File

@ -162,40 +162,70 @@ endfunction "}}}
"Returns: the list item after a:item in its list or empty item "Returns: the list item after a:item in its list or empty item
"If a:all is 1, the markers can differ "If a:all is 1, the markers can differ
function! s:get_next_list_item(item, all) "{{{ function! s:get_next_list_item(item, all) "{{{
return s:get_next_or_prev_list_item(a:item, +1, line('$')+1, a:all) let org_lvl = s:get_level(a:item.lnum)
if !a:all
let org_regex = s:regexp_of_marker(a:item)
endif
let cur_ln = s:get_next_line(a:item.lnum)
while cur_ln <= line('$')
let cur_lvl = s:get_level(cur_ln)
if cur_lvl <= org_lvl
if a:all
return s:get_any_item_of_level(cur_ln, cur_lvl, org_lvl)
else
return s:get_item_of_level(cur_ln, cur_lvl, org_lvl, org_regex)
endif
endif
let cur_ln = s:get_next_line(cur_ln)
endwhile
return s:empty_item()
endfunction "}}} endfunction "}}}
"Returns: the list item before a:item in its list or empty item "Returns: the list item before a:item in its list or empty item
"If a:all is 1, the markers can differ "If a:all is 1, the markers can differ
function! s:get_prev_list_item(item, all) "{{{ function! s:get_prev_list_item(item, all) "{{{
return s:get_next_or_prev_list_item(a:item, -1, 0, a:all)
endfunction "}}}
function! s:get_next_or_prev_list_item(item, direction, until, all) "{{{
let org_lvl = s:get_level(a:item.lnum) let org_lvl = s:get_level(a:item.lnum)
if !a:all if !a:all
let org_regex = s:regexp_of_marker(a:item) let org_regex = s:regexp_of_marker(a:item)
endif endif
let cur_ln = s:get_next_prev_line(a:item.lnum, a:direction)
while cur_ln != a:until
let cur_lvl = s:get_level(cur_ln)
let cur_linecontent = getline(cur_ln)
if cur_lvl == org_lvl let cur_ln = s:get_prev_line(a:item.lnum)
if a:all || cur_linecontent =~# '^\s*'.org_regex.'\s' while cur_ln >= 1
return s:get_item(cur_ln) let cur_lvl = s:get_level(cur_ln)
if cur_lvl <= org_lvl
if a:all
return s:get_any_item_of_level(cur_ln, cur_lvl, org_lvl)
else else
return s:empty_item() return s:get_item_of_level(cur_ln, cur_lvl, org_lvl, org_regex)
endif endif
elseif cur_lvl < org_lvl
return s:empty_item()
else
let cur_ln = s:get_next_prev_line(cur_ln, a:direction)
endif endif
let cur_ln = s:get_prev_line(cur_ln)
endwhile endwhile
return s:empty_item() return s:empty_item()
endfunction "}}} endfunction "}}}
function! s:get_item_of_level(cur_ln, cur_lvl, org_lvl, org_regex) "{{{
let cur_linecontent = getline(a:cur_ln)
if a:cur_lvl == a:org_lvl
if cur_linecontent =~# '^\s*'.a:org_regex.'\s'
return s:get_item(a:cur_ln)
else
return s:empty_item()
endif
elseif a:cur_lvl < a:org_lvl
return s:empty_item()
endif
endfunction "}}}
function! s:get_any_item_of_level(cur_ln, cur_lvl, org_lvl) "{{{
if a:cur_lvl == a:org_lvl
return s:get_item(a:cur_ln)
elseif a:cur_lvl < a:org_lvl
return s:empty_item()
endif
endfunction "}}}
function! s:first_char(string) "{{{ function! s:first_char(string) "{{{
return matchstr(a:string, '^.') return matchstr(a:string, '^.')
endfunction "}}} endfunction "}}}
@ -337,14 +367,6 @@ function! s:get_prev_line(lnum) "{{{
return prev_line return prev_line
endfunction "}}} endfunction "}}}
function! s:get_next_prev_line(lnum, dir) "{{{
if a:dir == 1
return s:get_next_line(a:lnum)
else
return s:get_prev_line(a:lnum)
endif
endfunction "}}}
function! s:get_first_child(item) "{{{ function! s:get_first_child(item) "{{{
if a:item.lnum >= line('$') if a:item.lnum >= line('$')
return s:empty_item() return s:empty_item()