hasufell/neosnippet.vim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix completed snippet behavior

Browse Source
This commit is contained in:
Shougo Matsushita 2016-02-06 11:50:02 +09:00
parent a323d8255a
commit 232d2e8def
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/neosnippet.vim
View File

@ -50,7 +50,7 @@ call neosnippet#util#set_default(
\ 'g:neosnippet#completed_pairs', {}) \ 'g:neosnippet#completed_pairs', {})
call neosnippet#util#set_default( call neosnippet#util#set_default(
\ 'g:neosnippet#_completed_pairs', \ 'g:neosnippet#_completed_pairs',
\ {'_':{ '(' : ')', '{' : '}', '"' : '"' }}) \ {'_':{ '(' : ')', '{' : '}', '"' : '"', '[' : ']' }})
"}}} "}}}
function! neosnippet#expandable_or_jumpable() "{{{ function! neosnippet#expandable_or_jumpable() "{{{

5
autoload/neosnippet/parser.vim
View File

@ -381,6 +381,11 @@ function! neosnippet#parser#_get_completed_snippet(completed_item, next_text) "{
endfor endfor
let snippet .= args let snippet .= args
if key != '(' && snippet == ''
let snippet .= '${' . cnt . '}'
let cnt += 1
endif
let snippet .= pair let snippet .= pair
let snippet .= '${' . cnt . '}' let snippet .= '${' . cnt . '}'

10
test/functions.vim
View File

@ -78,11 +78,6 @@ function! s:suite.get_completed_snippet()
\ 'menu' : '', 'info' : '' \ 'menu' : '', 'info' : ''
\ }, ''), '${1:#:hoge}${2:#:, ...})${3}') \ }, ''), '${1:#:hoge}${2:#:, ...})${3}')
call s:assert.equals(neosnippet#parser#_get_completed_snippet({
\ 'word' : 'foo{', 'abbr' : 'foo{}',
\ 'menu' : '', 'info' : ''
\ }, ''), '}${1}')
call s:assert.equals(neosnippet#parser#_get_completed_snippet({ call s:assert.equals(neosnippet#parser#_get_completed_snippet({
\ 'word' : 'foo{', 'abbr' : 'foo{', \ 'word' : 'foo{', 'abbr' : 'foo{',
\ 'menu' : '', 'info' : '' \ 'menu' : '', 'info' : ''
@ -128,5 +123,10 @@ function! s:suite.get_completed_snippet()
\ 'word' : 'forEach', 'abbr' : 'forEach(BiConsumer<Object, Object>)', \ 'word' : 'forEach', 'abbr' : 'forEach(BiConsumer<Object, Object>)',
\ 'menu' : '', 'info' : '' \ 'menu' : '', 'info' : ''
\ }, ''), '(${1:#:BiConsumer<>})${2}') \ }, ''), '(${1:#:BiConsumer<>})${2}')
call s:assert.equals(neosnippet#parser#_get_completed_snippet({
\ 'word' : 'for[', 'abbr' : '',
\ 'menu' : '', 'info' : ''
\ }, ''), '${1}]${2}')
endfunction endfunction