casraf/vim-matchup
1
0
Fork 0
mirror of https://github.com/chenasraf/vim-matchup.git synced 2026-05-18 01:38:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve loading time cf. #25

Browse Source
This commit is contained in:
Andy K. Massimino
2018-03-23 22:56:14 -04:00
parent f03ffd3e1c
commit 75191c64f3
5 changed files with 132 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
autoload/matchup.vim
View File

@@ -8,9 +8,13 @@ let s:save_cpo = &cpo
set cpo&vim
function! matchup#init()
call matchup#perf#tic('loading')
call s:init_options()
call s:init_modules()
call s:init_default_mappings()
call matchup#perf#toc('loading', 'init_done')
endfunction
function! s:init_options()
@@ -54,16 +58,15 @@ function! s:init_option(option, default)
endfunction
function! s:init_modules()
for l:mod in s:modules
if index(get(g:, 'matchup_disabled_modules', []), l:mod) >= 0
continue
endif
try
call matchup#{l:mod}#init_module()
catch /E117.*#init_/
endtry
for l:mod in [ 'delim', 'matchparen' ]
call matchup#perf#tic('loading_module')
call matchup#{l:mod}#init_module()
call matchup#perf#toc('loading_module', l:mod)
endfor
call s:motion_init_module()
call s:text_obj_init_module()
call s:misc_init_module()
endfunction
let g:v_motion_force = ''
@@ -130,19 +133,104 @@ function! s:init_default_mappings()
endfor
endif
if get(g:, 'matchup_imap_enabled', 0)
" call s:map('i', '<c-x><cr>', '<plug>(matchup-delim-close)')
" XXX other maps..?
endif
if get(g:, 'matchup_mouse_enabled', 1)
call s:map('n', '<2-LeftMouse>', '<plug>(matchup-double-click)')
endif
endfunction
let s:modules = map(
\ glob(fnamemodify(expand('<sfile>'), ':r') . '/*.vim', 0, 1),
\ 'fnamemodify(v:val, '':t:r'')')
" module initialization
function! s:motion_init_module() " {{{1
if !g:matchup_motion_enabled | return | endif
call matchup#perf#tic('loading_module')
" gets the current forced motion type
nnoremap <silent><expr> <sid>(wise)
\ empty(g:v_motion_force) ? 'v' : g:v_motion_force
" the basic motions % and g%
nnoremap <silent> <plug>(matchup-%)
\ :<c-u>call matchup#motion#find_matching_pair(0, 1)<cr>
nnoremap <silent> <plug>(matchup-g%)
\ :<c-u>call matchup#motion#find_matching_pair(0, 0)<cr>
" visual and operator-pending
xnoremap <silent> <sid>(matchup-%)
\ :<c-u>call matchup#motion#find_matching_pair(1, 1)<cr>
xmap <silent> <plug>(matchup-%) <sid>(matchup-%)
onoremap <silent> <plug>(matchup-%)
\ :<c-u>call matchup#motion#op('%')<cr>
xnoremap <silent> <sid>(matchup-g%)
\ :<c-u>call matchup#motion#find_matching_pair(1, 0)<cr>
xmap <silent> <plug>(matchup-g%) <sid>(matchup-g%)
onoremap <silent> <plug>(matchup-g%)
\ :<c-u>call matchup#motion#op('g%')<cr>
" ]% and [%
nnoremap <silent> <plug>(matchup-]%)
\ :<c-u>call matchup#motion#find_unmatched(0, 1)<cr>
nnoremap <silent> <plug>(matchup-[%)
\ :<c-u>call matchup#motion#find_unmatched(0, 0)<cr>
xnoremap <silent> <sid>(matchup-]%)
\ :<c-u>call matchup#motion#find_unmatched(1, 1)<cr>
xnoremap <silent> <sid>(matchup-[%)
\ :<c-u>call matchup#motion#find_unmatched(1, 0)<cr>
xmap <plug>(matchup-]%) <sid>(matchup-]%)
xmap <plug>(matchup-[%) <sid>(matchup-[%)
onoremap <silent> <plug>(matchup-]%)
\ :<c-u>call matchup#motion#op(']%')<cr>
onoremap <silent> <plug>(matchup-[%)
\ :<c-u>call matchup#motion#op('[%')<cr>
" jump inside z%
nnoremap <silent> <plug>(matchup-z%)
\ :<c-u>call matchup#motion#jump_inside(0)<cr>
xnoremap <silent> <sid>(matchup-z%)
\ :<c-u>call matchup#motion#jump_inside(1)<cr>
xmap <silent> <plug>(matchup-z%) <sid>(matchup-z%)
onoremap <silent> <plug>(matchup-z%)
\ :<c-u>call matchup#motion#op('z%')<cr>
call matchup#perf#toc('loading_module', 'motion')
endfunction
" }}}1
function! s:text_obj_init_module() " {{{1
if !g:matchup_text_obj_enabled | return | endif
call matchup#perf#tic('loading_module')
for [l:map, l:name, l:opt] in [
\ ['%', 'delimited', 'delim_all'],
\]
let l:p1 = 'noremap <silent> <plug>(matchup-'
let l:p2 = l:map . ') :<c-u>call matchup#text_obj#' . l:name
let l:p3 = empty(l:opt) ? ')<cr>' : ', ''' . l:opt . ''')<cr>'
execute 'x' . l:p1 . 'i' . l:p2 . '(1, 1' . l:p3
execute 'x' . l:p1 . 'a' . l:p2 . '(0, 1' . l:p3
execute 'o' . l:p1 . 'i' . l:p2 . '(1, 0' . l:p3
execute 'o' . l:p1 . 'a' . l:p2 . '(0, 0' . l:p3
endfor
nnoremap <silent> <plug>(matchup-double-click)
\ :<c-u>call matchup#text_obj#double_click()<cr>
call matchup#perf#toc('loading_module', 'motion')
endfunction
" }}}1
function! s:misc_init_module() " {{{1
call matchup#perf#tic('loading_module')
command! MatchupReload call matchup#misc#reload()
nnoremap <plug>(matchup-reload) :<c-u>MatchupReload<cr>
call matchup#perf#toc('loading_module', 'misc')
endfunction
" }}}1
let &cpo = s:save_cpo

31
autoload/matchup/matchparen.vim
View File

@@ -45,11 +45,26 @@ function! matchup#matchparen#enable() " {{{1
autocmd InsertEnter * call s:matchparen.highlight(1, 1)
augroup END
endfunction
" }}}1
function! s:pi_paren_sid() " {{{1
if s:pi_paren_sid >= 0
return s:pi_paren_sid
endif
let s:pi_paren_sid = 0
if get(g:, 'loaded_matchparen')
let l:pat = expand('$VIM').'.\+matchparen\.vim'
let l:lines = matchup#util#command('scriptnames')
call filter(l:lines, 'v:val =~# l:pat')
let l:pat = '\%#=1\V'.expand('$VIM').'\m.\+matchparen\.vim$'
if v:version >= 800
" execute() was added in 7.4.2008
" :filter was introduced in 7.4.2244 but I have not tested it there
let l:lines = split(execute("filter '".l:pat."' scriptnames"), '\n')
else
let l:lines = matchup#util#command('scriptnames')
call filter(l:lines, 'v:val =~# l:pat')
endif
let s:pi_paren_sid = matchstr(get(l:lines, 0), '\d\+\ze: ')
if !exists('*<SNR>'.s:pi_paren_sid.'_Highlight_Matching_Pair')
let s:pi_paren_sid = 0
@@ -59,11 +74,13 @@ function! matchup#matchparen#enable() " {{{1
let s:pi_paren_fcn = function('<SNR>'.s:pi_paren_sid
\ .'_Highlight_Matching_Pair')
endif
call s:matchparen.highlight()
return s:pi_paren_sid
endfunction
let s:pi_paren_sid = -1
" }}}1
function! matchup#matchparen#disable() " {{{1
call s:matchparen.clear()
autocmd! matchup_matchparen
@@ -168,8 +185,10 @@ endfunction
function! s:matchparen.highlight(...) abort dict " {{{1
if !g:matchup_matchparen_enabled | return | endif
if has('vim_starting') | return | endif
if !get(b:, 'matchup_matchparen_enabled', 1)
\ && get(b:, 'matchup_matchparen_fallback', 1) && s:pi_paren_sid
\ && get(b:, 'matchup_matchparen_fallback', 1) && s:pi_paren_sid()
return call(s:pi_paren_fcn, [])
endif

9
autoload/matchup/misc.vim
View File

@@ -4,13 +4,6 @@
" Email: a@normed.space
"
function! matchup#misc#init_module() " {{{1
command! MatchupReload call matchup#misc#reload()
nnoremap <plug>(matchup-reload) :<c-u>MatchupReload<cr>
endfunction
" }}}1
" {{{1 function! matchup#misc#reload()
if get(s:, 'reload_guard', 1)
function! matchup#misc#reload() abort
@@ -26,6 +19,8 @@ if get(s:, 'reload_guard', 1)
endfunction
endif
" }}}1
let s:file = expand('<sfile>')
" vim: fdm=marker sw=2

59
autoload/matchup/motion.vim
View File

@@ -7,63 +7,6 @@
let s:save_cpo = &cpo
set cpo&vim
function! matchup#motion#init_module() " {{{1
if !g:matchup_motion_enabled | return | endif
" gets the current forced motion type
nnoremap <silent><expr> <sid>(wise)
\ empty(g:v_motion_force) ? 'v' : g:v_motion_force
" jump between matching pairs
" TODO can % be made vi compatible wrt yank (:h quote_number)?
" the basic motions % and g%
nnoremap <silent> <plug>(matchup-%)
\ :<c-u>call matchup#motion#find_matching_pair(0, 1)<cr>
nnoremap <silent> <plug>(matchup-g%)
\ :<c-u>call matchup#motion#find_matching_pair(0, 0)<cr>
" visual and operator-pending
xnoremap <silent> <sid>(matchup-%)
\ :<c-u>call matchup#motion#find_matching_pair(1, 1)<cr>
xmap <silent> <plug>(matchup-%) <sid>(matchup-%)
onoremap <silent> <plug>(matchup-%)
\ :<c-u>call matchup#motion#op('%')<cr>
xnoremap <silent> <sid>(matchup-g%)
\ :<c-u>call matchup#motion#find_matching_pair(1, 0)<cr>
xmap <silent> <plug>(matchup-g%) <sid>(matchup-g%)
onoremap <silent> <plug>(matchup-g%)
\ :<c-u>call matchup#motion#op('g%')<cr>
" ]% and [%
nnoremap <silent> <plug>(matchup-]%)
\ :<c-u>call matchup#motion#find_unmatched(0, 1)<cr>
nnoremap <silent> <plug>(matchup-[%)
\ :<c-u>call matchup#motion#find_unmatched(0, 0)<cr>
xnoremap <silent> <sid>(matchup-]%)
\ :<c-u>call matchup#motion#find_unmatched(1, 1)<cr>
xnoremap <silent> <sid>(matchup-[%)
\ :<c-u>call matchup#motion#find_unmatched(1, 0)<cr>
xmap <plug>(matchup-]%) <sid>(matchup-]%)
xmap <plug>(matchup-[%) <sid>(matchup-[%)
onoremap <silent> <plug>(matchup-]%)
\ :<c-u>call matchup#motion#op(']%')<cr>
onoremap <silent> <plug>(matchup-[%)
\ :<c-u>call matchup#motion#op('[%')<cr>
" jump inside z%
nnoremap <silent> <plug>(matchup-z%)
\ :<c-u>call matchup#motion#jump_inside(0)<cr>
xnoremap <silent> <sid>(matchup-z%)
\ :<c-u>call matchup#motion#jump_inside(1)<cr>
xmap <silent> <plug>(matchup-z%) <sid>(matchup-z%)
onoremap <silent> <plug>(matchup-z%)
\ :<c-u>call matchup#motion#op('z%')<cr>
endfunction
function! s:snr()
return str2nr(matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_snr$'))
endfunction
@@ -76,8 +19,6 @@ function! matchup#motion#op(motion)
unlet s:v_operator
endfunction
" }}}1
function! matchup#motion#find_matching_pair(visual, down) " {{{1
let [l:count, l:count1] = [v:count, v:count1]

20
autoload/matchup/text_obj.vim
View File

@@ -7,26 +7,6 @@
let s:save_cpo = &cpo
set cpo&vim
function! matchup#text_obj#init_module() " {{{1
if !g:matchup_text_obj_enabled | return | endif
for [l:map, l:name, l:opt] in [
\ ['%', 'delimited', 'delim_all'],
\]
let l:p1 = 'noremap <silent> <plug>(matchup-'
let l:p2 = l:map . ') :<c-u>call matchup#text_obj#' . l:name
let l:p3 = empty(l:opt) ? ')<cr>' : ', ''' . l:opt . ''')<cr>'
execute 'x' . l:p1 . 'i' . l:p2 . '(1, 1' . l:p3
execute 'x' . l:p1 . 'a' . l:p2 . '(0, 1' . l:p3
execute 'o' . l:p1 . 'i' . l:p2 . '(1, 0' . l:p3
execute 'o' . l:p1 . 'a' . l:p2 . '(0, 0' . l:p3
endfor
nnoremap <silent> <plug>(matchup-double-click)
\ :<c-u>call matchup#text_obj#double_click()<cr>
endfunction
" }}}1
function! matchup#text_obj#delimited(is_inner, visual, type) " {{{1
" get the current selection, move to end of range
if a:visual