lauchmelder/vim-sussify
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Refactor set_mark() and open_buffers()

Browse source
This commit is contained in:
Marco Hinz 2013-08-09 12:18:06 +02:00
parent 888dcfbc0d
commit a71514a97b
1 changed files with 42 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
autoload/startify.vim
View file

@ -336,31 +336,33 @@ endfunction
" Function: s:set_mark {{{1 " Function: s:set_mark {{{1
" "
" Markers are saved in the s:marked dict using the follow format: " Markers are saved in the s:marked dict using the follow format:
" - s:marked[0]: ID (for sorting) " - s:marked[0]: ID
" - s:marked[1]: what the brackets contained before " - s:marked[1]: path
" - s:marked[2]: the actual path " - s:marked[2]: type (buffer, split, vsplit)
" - s:marked[3]: type (buffer, split, vsplit)
" "
function! s:set_mark(type) abort function! s:set_mark(type) abort
if !exists('s:marked') if !exists('s:marked')
let s:marked = {} let s:marked = {}
let s:nmarked = 0
endif endif
" matches[1]: content between brackets
" matches[2]: path let [id, path] = matchlist(getline('.'), '\v\[(.*)\]\s+(.*)')[1:2]
let matches = matchlist(getline('.'), '\v\[(.*)\]\s+(.*)')
if matches[2] =~ '\V<empty buffer>\|<quit>' || matches[2] =~ '^\w\+$' if path =~# '\V<empty buffer>\|<quit>'
return return
endif endif
setlocal modifiable setlocal modifiable
if matches[1] =~ 'B\|S\|V'
let s:nmarked -= 1 " set markers
execute 'normal! ci]'. remove(s:marked, line('.'))[1] if id =~# '[BSV]'
" replace marker by old ID
execute 'normal! ci]'. remove(s:marked, line('.'))[0]
else else
let s:marked[line('.')] = [s:nmarked, matches[1], matches[2], a:type] " save ID and replace it by the marker of the given type
let s:nmarked += 1 let s:marked[line('.')] = [id, path, a:type]
execute 'normal! ci]'. repeat(a:type, len(matches[1])) execute 'normal! ci]'. repeat(a:type, len(id))
endif endif
setlocal nomodifiable nomodified setlocal nomodifiable nomodified
endfunction endfunction
@ -369,34 +371,39 @@ function! s:open_buffers(cword) abort
if exists('s:marked') && !empty(s:marked) if exists('s:marked') && !empty(s:marked)
enew enew
setlocal nobuflisted setlocal nobuflisted
for i in range(len(s:marked))
" markers found; open one or more buffers
if exists('s:marked') && !empty(s:marked)
for val in values(s:marked) for val in values(s:marked)
if val[0] == i let [path, type] = val[1:2]
if val[3] == 'S' " open in split
if line2byte('$') == -1 if type == 'S'
execute 'edit' val[2] if line2byte('$') == -1
else execute 'edit' path
execute 'split' val[2]
endif
elseif val[3] == 'V'
if line2byte('$') == -1
execute 'edit' val[2]
else
execute 'vsplit' val[2]
endif
else else
execute 'edit' val[2] execute 'split' path
endif endif
continue " open in vsplit
elseif type == 'V'
if line2byte('$') == -1
execute 'edit' path
else
execute 'vsplit' path
endif
" open in current window
else
execute 'edit' path
endif endif
continue
endfor endfor
endfor " no markers found; open a single buffer
else else
execute 'normal' a:cword execute 'normal' a:cword
endif
endif endif
if exists('s:marked') if exists('s:marked')
unlet s:marked unlet s:marked
unlet s:nmarked
endif endif
endfunction endfunction