Added support for neosnippet#annonymous (#251)
This commit is contained in:
Karl Yngve Lervåg
parent
de296341a5
commit
9451bdee5d
@ -8,88 +8,18 @@ function! vimtex#imaps#init_options() " {{{1
|
||||
call vimtex#util#set_default('g:vimtex_imaps_enabled', 1)
|
||||
call vimtex#util#set_default('g:vimtex_imaps_leader', '`')
|
||||
call vimtex#util#set_default('g:vimtex_imaps_disabled', [])
|
||||
call vimtex#util#set_default('g:vimtex_imaps_list', [
|
||||
\ { 'lhs_rhs' : ['...', '\dots'], 'leader' : '' },
|
||||
\ { 'lhs_rhs' : ['<m-i>', '\item '], 'leader' : '' },
|
||||
\ { 'lhs_rhs' : ['__', '_\{$1\}'], 'leader' : '', 'wrapper' : 's:wrap_math_ultisnips'},
|
||||
\ { 'lhs_rhs' : ['^^', '^\{$1\}'], 'leader' : '', 'wrapper' : 's:wrap_math_ultisnips'},
|
||||
\ { 'lhs_rhs' : ['((', '\left($1\right)'], 'leader' : '', 'wrapper' : 's:wrap_math_ultisnips'},
|
||||
\ { 'lhs_rhs' : ['[[', '\left[$1\right]'], 'leader' : '', 'wrapper' : 's:wrap_math_ultisnips'},
|
||||
\ { 'lhs_rhs' : ['{{', '\left\\{$1\right\\}'], 'leader' : '', 'wrapper' : 's:wrap_math_ultisnips'},
|
||||
\ { 'lhs_rhs' : ['i', '\int_{$1}^{$2}'], 'wrapper' : 's:wrap_math_ultisnips'},
|
||||
\ { 'lhs_rhs' : ['S', '\sum_{$1}^{$2}'], 'wrapper' : 's:wrap_math_ultisnips'},
|
||||
\ { 'lhs_rhs' : ['/', '\frac{$1}{$2}'], 'wrapper' : 's:wrap_math_ultisnips'},
|
||||
\ { 'lhs_rhs' : ['~', '\tilde{$1}'], 'wrapper' : 's:wrap_math_ultisnips'},
|
||||
\ { 'lhs_rhs' : ['^', '\hat{$1}'], 'wrapper' : 's:wrap_math_ultisnips'},
|
||||
\ { 'lhs_rhs' : [':', '\dot{$1}'], 'wrapper' : 's:wrap_math_ultisnips'},
|
||||
\ { 'lhs_rhs' : ['_', '\bar{$1}'], 'wrapper' : 's:wrap_math_ultisnips'},
|
||||
\ { 'lhs_rhs' : ['lim', '\lim_{$1}'], 'wrapper' : 's:wrap_math_ultisnips'},
|
||||
\ { 'lhs_rhs' : ['0', '\emptyset'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['6', '\partial'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['8', '\infty'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['=', '\equiv'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['\', '\setminus'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['.', '\cdot'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['*', '\times'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['<', '\leq'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['>', '\geq'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['[', '\subseteq'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : [']', '\supseteq'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['{', '\subset'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['}', '\supset'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qj', '\downarrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['ql', '\leftarrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qh', '\rightarrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qk', '\uparrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qJ', '\Downarrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qL', '\Leftarrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qH', '\Rightarrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qK', '\Uparrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['a', '\alpha'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['b', '\beta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['c', '\chi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['d', '\delta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['e', '\epsilon'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['f', '\varphi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['g', '\gamma'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['h', '\eta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['k', '\kappa'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['l', '\lambda'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['m', '\mu'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['n', '\nu'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['p', '\pi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['q', '\theta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['r', '\rho'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['s', '\sigma'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['t', '\tau'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['y', '\psi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['u', '\upsilon'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['w', '\omega'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['z', '\zeta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['x', '\xi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['A', '\Alpha'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['B', '\Beta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['G', '\Gamma'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['D', '\Delta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['E', '\varepsilon'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['Z', '\Zeta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['Y', '\Eta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['F', '\Phi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['G', '\Gamma'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['L', '\Lambda'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['N', '\Nabla'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['Q', '\Theta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['S', '\Sigma'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['R', '\varrho'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['W', '\Omega'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['X', '\Xi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['Y', '\Psi'], 'wrapper' : 's:wrap_math'},
|
||||
\])
|
||||
call vimtex#util#set_default('g:vimtex_imaps_snippet_engine', 'ultisnips')
|
||||
call vimtex#util#set_default('g:vimtex_imaps_list', s:default_maps())
|
||||
endfunction
|
||||
|
||||
" }}}1
|
||||
function! vimtex#imaps#init_script() " {{{1
|
||||
let s:has_ultisnips = exists('*UltiSnips#Anon')
|
||||
|
||||
try
|
||||
silent! call neosnippet#annonymous('')
|
||||
endtry
|
||||
let s:has_neosnippet = exists('*neosnippet#annonymous')
|
||||
endfunction
|
||||
|
||||
" }}}1
|
||||
@ -108,8 +38,12 @@ function! vimtex#imaps#add_map(map) " {{{1
|
||||
let l:rhs = a:map.lhs_rhs[1]
|
||||
let l:leader = get(a:map, 'leader', g:vimtex_imaps_leader)
|
||||
let l:wrapper = get(a:map, 'wrapper', '')
|
||||
|
||||
" Don't create map if it is disabled
|
||||
if index(g:vimtex_imaps_disabled, l:lhs) >= 0 | return | endif
|
||||
if l:wrapper =~? 'ultisnips' && !s:has_ultisnips | return | endif
|
||||
|
||||
" Don't create map if snippet feature is not active/available
|
||||
if !s:test_snippet_requirement(l:wrapper) | return | endif
|
||||
|
||||
" Escape leader if it exists
|
||||
if l:leader !=# '' && !hasmapto(l:leader, 'i')
|
||||
@ -136,16 +70,25 @@ function! s:wrap_math(lhs, rhs) " {{{1
|
||||
endfunction
|
||||
|
||||
" }}}1
|
||||
function! s:wrap_ultisnips(lhs, rhs) " {{{1
|
||||
return a:lhs . '<c-r>=UltiSnips#Anon('''
|
||||
\ . a:rhs . ''', ''' . a:lhs . ''', '''', ''i'')<cr>'
|
||||
function! s:wrap_snippet(lhs, rhs) " {{{1
|
||||
if g:vimtex_imaps_snippet_engine ==# 'neosnippet'
|
||||
return '<c-r>=neosnippet#annonymous(''' . a:rhs . ''')<cr>'
|
||||
else
|
||||
return a:lhs . '<c-r>=UltiSnips#Anon('''
|
||||
\ . a:rhs . ''', ''' . a:lhs . ''', '''', ''i'')<cr>'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" }}}1
|
||||
function! s:wrap_math_ultisnips(lhs, rhs) " {{{1
|
||||
return a:lhs . '<c-r>=<sid>is_math() ? '
|
||||
\ . 'UltiSnips#Anon(''' . a:rhs . ''', ''' . a:lhs . ''', '''', ''i'')'
|
||||
\ . ': ''''<cr>'
|
||||
function! s:wrap_math_snippet(lhs, rhs) " {{{1
|
||||
if g:vimtex_imaps_snippet_engine ==# 'neosnippet'
|
||||
return '<c-r>=<sid>is_math() ? neosnippet#annonymous(''' . a:rhs . ''')'
|
||||
\ . ' : ' . string(a:lhs) . '<cr>'
|
||||
else
|
||||
return a:lhs . '<c-r>=<sid>is_math() ? '
|
||||
\ . 'UltiSnips#Anon(''' . a:rhs . ''', ''' . a:lhs . ''', '''', ''i'')'
|
||||
\ . ': ''''<cr>'
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" }}}1
|
||||
@ -158,6 +101,107 @@ function! s:is_math() " {{{1
|
||||
\ 'synIDattr(v:val, ''name'')'), '^texMathZone[A-Z]$') >= 0
|
||||
endfunction
|
||||
|
||||
" }}}1
|
||||
function! s:default_maps() " {{{1
|
||||
" Define snippet maps with neosnippet syntax
|
||||
let snippets = [
|
||||
\ { 'lhs_rhs' : ['__', '_\{${1}\}${0}'], 'leader' : '', 'wrapper' : 's:wrap_math_snippet'},
|
||||
\ { 'lhs_rhs' : ['^^', '^\{${1}\}${0}'], 'leader' : '', 'wrapper' : 's:wrap_math_snippet'},
|
||||
\ { 'lhs_rhs' : ['((', '\left(${1}\right)${0}'], 'leader' : '', 'wrapper' : 's:wrap_math_snippet'},
|
||||
\ { 'lhs_rhs' : ['[[', '\left[${1}\right]${0}'], 'leader' : '', 'wrapper' : 's:wrap_math_snippet'},
|
||||
\ { 'lhs_rhs' : ['{{', '\left\\{${1}\right\\}${0}'], 'leader' : '', 'wrapper' : 's:wrap_math_snippet'},
|
||||
\ { 'lhs_rhs' : ['i', '\int_{${1}}^{${2}}${0}'], 'wrapper' : 's:wrap_math_snippet'},
|
||||
\ { 'lhs_rhs' : ['S', '\sum_{${1}}^{${2}}${0}'], 'wrapper' : 's:wrap_math_snippet'},
|
||||
\ { 'lhs_rhs' : ['/', '\frac{${1}}{${2}}${0}'], 'wrapper' : 's:wrap_math_snippet'},
|
||||
\ { 'lhs_rhs' : ['~', '\tilde{${1}}${0}'], 'wrapper' : 's:wrap_math_snippet'},
|
||||
\ { 'lhs_rhs' : ['^', '\hat{${1}}${0}'], 'wrapper' : 's:wrap_math_snippet'},
|
||||
\ { 'lhs_rhs' : [':', '\dot{${1}}${0}'], 'wrapper' : 's:wrap_math_snippet'},
|
||||
\ { 'lhs_rhs' : ['_', '\bar{${1}}${0}'], 'wrapper' : 's:wrap_math_snippet'},
|
||||
\ { 'lhs_rhs' : ['lim', '\lim_{${1}}${0}'], 'wrapper' : 's:wrap_math_snippet'},
|
||||
\]
|
||||
|
||||
" Convert to ultisnips syntax if desired
|
||||
if g:vimtex_imaps_snippet_engine ==# 'ultisnips'
|
||||
for snippet in snippets
|
||||
let snippet.lhs_rhs[1]
|
||||
\ = substitute(snippet.lhs_rhs[1], '\${\(\d\)}', '$\1', 'g')
|
||||
endfor
|
||||
endif
|
||||
|
||||
" Return default snippet list including list of simple maps
|
||||
return snippets + [
|
||||
\ { 'lhs_rhs' : ['...', '\dots'], 'leader' : '' },
|
||||
\ { 'lhs_rhs' : ['<m-i>', '\item '], 'leader' : '' },
|
||||
\ { 'lhs_rhs' : ['0', '\emptyset'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['6', '\partial'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['8', '\infty'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['=', '\equiv'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['\', '\setminus'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['.', '\cdot'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['*', '\times'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['<', '\leq'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['>', '\geq'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['[', '\subseteq'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : [']', '\supseteq'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['{', '\subset'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['}', '\supset'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qj', '\downarrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['ql', '\leftarrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qh', '\rightarrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qk', '\uparrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qJ', '\Downarrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qL', '\Leftarrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qH', '\Rightarrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['qK', '\Uparrow'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['a', '\alpha'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['b', '\beta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['c', '\chi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['d', '\delta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['e', '\epsilon'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['f', '\varphi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['g', '\gamma'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['h', '\eta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['k', '\kappa'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['l', '\lambda'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['m', '\mu'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['n', '\nu'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['p', '\pi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['q', '\theta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['r', '\rho'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['s', '\sigma'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['t', '\tau'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['y', '\psi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['u', '\upsilon'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['w', '\omega'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['z', '\zeta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['x', '\xi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['A', '\Alpha'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['B', '\Beta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['G', '\Gamma'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['D', '\Delta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['E', '\varepsilon'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['Z', '\Zeta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['Y', '\Eta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['F', '\Phi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['G', '\Gamma'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['L', '\Lambda'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['N', '\Nabla'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['Q', '\Theta'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['S', '\Sigma'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['R', '\varrho'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['W', '\Omega'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['X', '\Xi'], 'wrapper' : 's:wrap_math'},
|
||||
\ { 'lhs_rhs' : ['Y', '\Psi'], 'wrapper' : 's:wrap_math'},
|
||||
\]
|
||||
endfunction
|
||||
|
||||
" }}}1
|
||||
function! s:test_snippet_requirement(func_name) " {{{1
|
||||
return (a:func_name !~# 'snippet$')
|
||||
\ || (g:vimtex_imaps_snippet_engine ==# 'neosnippet' && s:has_neosnippet)
|
||||
\ || (g:vimtex_imaps_snippet_engine ==# 'ultisnips' && s:has_ultisnips)
|
||||
endfunction
|
||||
|
||||
" }}}1
|
||||
|
||||
" vim: fdm=marker sw=2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user