- Skip neocomplcache completion when expand or jump snippets.
This commit is contained in:
parent
8e9d221d06
commit
d01cd7247f
@ -1,7 +1,7 @@
|
|||||||
"=============================================================================
|
"=============================================================================
|
||||||
" FILE: neosnippet.vim
|
" FILE: neosnippet.vim
|
||||||
" AUTHOR: Shougo Matsushita <Shougo.Matsu@gmail.com>
|
" AUTHOR: Shougo Matsushita <Shougo.Matsu@gmail.com>
|
||||||
" Last Modified: 15 Nov 2012.
|
" Last Modified: 13 Dec 2012.
|
||||||
" License: MIT license {{{
|
" License: MIT license {{{
|
||||||
" Permission is hereby granted, free of charge, to any person obtaining
|
" Permission is hereby granted, free of charge, to any person obtaining
|
||||||
" a copy of this software and associated documentation files (the
|
" a copy of this software and associated documentation files (the
|
||||||
@ -514,6 +514,8 @@ function! s:snippets_expand(cur_text, col)"{{{
|
|||||||
\ a:cur_text, a:col, cur_word)
|
\ a:cur_text, a:col, cur_word)
|
||||||
endfunction"}}}
|
endfunction"}}}
|
||||||
function! neosnippet#jump(cur_text, col)"{{{
|
function! neosnippet#jump(cur_text, col)"{{{
|
||||||
|
call s:skip_next_auto_completion()
|
||||||
|
|
||||||
" Get patterns and count.
|
" Get patterns and count.
|
||||||
if empty(s:snippets_expand_stack)
|
if empty(s:snippets_expand_stack)
|
||||||
return s:search_outof_range(a:col)
|
return s:search_outof_range(a:col)
|
||||||
@ -568,6 +570,8 @@ function! s:snippets_jump_or_expand(cur_text, col)"{{{
|
|||||||
endfunction"}}}
|
endfunction"}}}
|
||||||
|
|
||||||
function! neosnippet#expand(cur_text, col, trigger_name)"{{{
|
function! neosnippet#expand(cur_text, col, trigger_name)"{{{
|
||||||
|
call s:skip_next_auto_completion()
|
||||||
|
|
||||||
let snippets = neosnippet#get_snippets()
|
let snippets = neosnippet#get_snippets()
|
||||||
|
|
||||||
if a:trigger_name == '' || !has_key(snippets, a:trigger_name)
|
if a:trigger_name == '' || !has_key(snippets, a:trigger_name)
|
||||||
@ -683,7 +687,8 @@ function! neosnippet#expand_target()"{{{
|
|||||||
call neosnippet#substitute_selected_text(visualmode(),
|
call neosnippet#substitute_selected_text(visualmode(),
|
||||||
\ base_indent)
|
\ base_indent)
|
||||||
|
|
||||||
let col = col('.') < len(base_indent)+1 ? len(base_indent)+1 : col('.')
|
let col = (col('.') < len(base_indent)+1) ?
|
||||||
|
\ len(base_indent)+1 : col('.')
|
||||||
call neosnippet#expand(neosnippet#util#get_cur_text(), col, trigger)
|
call neosnippet#expand(neosnippet#util#get_cur_text(), col, trigger)
|
||||||
endfunction"}}}
|
endfunction"}}}
|
||||||
function! s:indent_snippet(begin, end)"{{{
|
function! s:indent_snippet(begin, end)"{{{
|
||||||
@ -1250,6 +1255,13 @@ function! neosnippet#clear_select_mode_mappings()"{{{
|
|||||||
snoremap <left> <ESC>bi
|
snoremap <left> <ESC>bi
|
||||||
endfunction"}}}
|
endfunction"}}}
|
||||||
|
|
||||||
|
function! s:skip_next_auto_completion() "{{{
|
||||||
|
" Skip next auto completion.
|
||||||
|
if exists('*neocomplcache#skip_next_complete')
|
||||||
|
call neocomplcache#skip_next_complete()
|
||||||
|
endif
|
||||||
|
endfunction"}}}
|
||||||
|
|
||||||
if g:neosnippet#enable_snipmate_compatibility
|
if g:neosnippet#enable_snipmate_compatibility
|
||||||
" For snipMate function.
|
" For snipMate function.
|
||||||
function! Filename(...)
|
function! Filename(...)
|
||||||
|
@ -711,6 +711,9 @@ A: Please try below settings. It defines snipMate function.
|
|||||||
==============================================================================
|
==============================================================================
|
||||||
CHANGELOG *neosnippet-changelog*
|
CHANGELOG *neosnippet-changelog*
|
||||||
|
|
||||||
|
2012-12-13
|
||||||
|
- Skip neocomplcache completion when expand or jump snippets.
|
||||||
|
|
||||||
2012-11-09
|
2012-11-09
|
||||||
- Improved syntax error.
|
- Improved syntax error.
|
||||||
- Fixed error in java snippet.
|
- Fixed error in java snippet.
|
||||||
|
Loading…
Reference in New Issue
Block a user