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

Simplify detection if two markers have same kind

Browse Source 
Ref #5
This commit is contained in:
EinfachToll 2013-07-22 10:19:54 +02:00
parent 58e072fa92
commit 8c5760ae98
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
autoload/vimwiki/lst.vim
View File

@ -140,8 +140,12 @@ function! s:regexp_of_marker(item) "{{{
if a:item.type == 1 if a:item.type == 1
return vimwiki#u#escape(a:item.mrkr) return vimwiki#u#escape(a:item.mrkr)
elseif a:item.type == 2 elseif a:item.type == 2
let kind = s:guess_kind_of_numbered_item(a:item) for ki in ['d', 'u', 'l']
return s:char_to_rx[kind] . vimwiki#u#escape(a:item.mrkr[-1:]) let match = matchstr(a:item.mrkr, '\'.ki.'\+['.s:number_divisors.']')
if match != ''
return '\'.ki.'\+'.vimwiki#u#escape(match[-1:])
endif
endfor
else else
return '' return ''
endif endif
@ -236,7 +240,7 @@ function! s:guess_kind_of_numbered_item(item) "{{{
if item_above.type != 0 if item_above.type != 0
if index(s:number_kinds, 'A') == -1 || if index(s:number_kinds, 'A') == -1 ||
\ (item_above.mrkr[-1:] !=# divisor && number_chars =~# 'I\+') || \ (item_above.mrkr[-1:] !=# divisor && number_chars =~# 'I\+') ||
\ s:increment_i(item_above.mrkr[:-2]) ==# number_chars \ s:increment_I(item_above.mrkr[:-2]) ==# number_chars
return 'I' return 'I'
else else
return 'A' return 'A'
@ -255,16 +259,29 @@ endfunction "}}}
function! s:get_first_item_in_list(item, all) "{{{ function! s:get_first_item_in_list(item, all) "{{{
let first_item = a:item let cur_item = a:item
while 1 while 1
let prev_item = s:get_prev_list_item(first_item, a:all) let prev_item = s:get_prev_list_item(cur_item, a:all)
if prev_item.type == 0 if prev_item.type == 0
break break
else else
let first_item = prev_item let cur_item = prev_item
endif endif
endwhile endwhile
return first_item return cur_item
endfunction "}}}
function! s:get_last_item_in_list(item, all) "{{{
let cur_item = a:item
while 1
let next_item = s:get_next_list_item(cur_item, a:all)
if next_item.type == 0
break
else
let cur_item = next_item
endif
endwhile
return cur_item
endfunction "}}} endfunction "}}}
"Returns: lnum+1 in most cases, but skips blank lines and preformatted text "Returns: lnum+1 in most cases, but skips blank lines and preformatted text
@ -881,19 +898,16 @@ endfunction "}}}
function! vimwiki#lst#change_marker_in_list(new_mrkr) "{{{ function! vimwiki#lst#change_marker_in_list(new_mrkr) "{{{
let first_item = s:get_first_item_in_list(s:get_corresponding_item(line('.')), 0) let cur_item = s:get_corresponding_item(line('.'))
if first_item.type == 0 | return | endif let first_item = s:get_first_item_in_list(cur_item, 0)
let last_item = s:get_last_item_in_list(cur_item, 0)
if first_item.type == 0 || last_item.type == 0 | return | endif
let first_item_line = first_item.lnum let first_item_line = first_item.lnum
let cur_item = first_item let cur_item = first_item
while 1 while cur_item.type != 0 && cur_item.lnum <= last_item.lnum
let next_item = s:get_next_list_item(cur_item, 0)
call s:set_new_mrkr(cur_item, a:new_mrkr) call s:set_new_mrkr(cur_item, a:new_mrkr)
if next_item.type == 0 let cur_item = s:get_next_list_item(cur_item, 1)
break
else
let cur_item = next_item
endif
endwhile endwhile
call s:adjust_numbered_list(s:get_item(first_item_line), 0, 0) call s:adjust_numbered_list(s:get_item(first_item_line), 0, 0)
@ -1288,8 +1302,10 @@ function! vimwiki#lst#setup_marker_infos()
endfor endfor
let s:number_kinds = [] let s:number_kinds = []
let s:number_divisors = ""
for i in g:vimwiki_number_types for i in g:vimwiki_number_types
call add(s:number_kinds, i[0]) call add(s:number_kinds, i[0])
let s:number_divisors .= vimwiki#u#escape(i[1])
endfor endfor
let s:char_to_rx = {'1': '\d\+', 'i': '[ivxlcdm]\+', 'I': '[IVXLCDM]\+', 'a': '\l\{1,2}', 'A': '\u\{1,2}'} let s:char_to_rx = {'1': '\d\+', 'i': '[ivxlcdm]\+', 'I': '[IVXLCDM]\+', 'a': '\l\{1,2}', 'A': '\u\{1,2}'}