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

- Fixed s:get_cursor_snippet().

Browse Source
This commit is contained in:
Shougo Matsushita 2012-10-04 14:28:37 +09:00
parent 306ef025a7
commit ce8e095c9c
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
autoload/neosnippet.vim
View File

@ -418,11 +418,8 @@ function! s:get_prev_word(cur_keyword_str)"{{{
endfunction"}}} endfunction"}}}
function! s:get_cursor_snippet(snippets, cur_text)"{{{ function! s:get_cursor_snippet(snippets, cur_text)"{{{
let cur_word = matchstr(a:cur_text, '\S\+$') let cur_word = matchstr(a:cur_text, '\S\+$')
while cur_word != '' && !has_key(a:snippets, cur_word)
let cur_word = cur_word[1:]
endwhile
return cur_word return has_key(a:snippets, cur_word) ? cur_word : ''
endfunction"}}} endfunction"}}}
function! s:snippets_expand(cur_text, col)"{{{ function! s:snippets_expand(cur_text, col)"{{{
let cur_word = s:get_cursor_snippet( let cur_word = s:get_cursor_snippet(
@ -463,14 +460,7 @@ function! s:snippets_jump(cur_text, col)"{{{
endfunction"}}} endfunction"}}}
function! s:snippets_expand_or_jump(cur_text, col)"{{{ function! s:snippets_expand_or_jump(cur_text, col)"{{{
let cur_word = s:get_cursor_snippet( let cur_word = s:get_cursor_snippet(
\ neosnippet#get_snippets(), \ neosnippet#get_snippets(), a:cur_text)
\ a:cur_text)
if cur_word == ''
" Check by force_expand.
let cur_word = s:get_cursor_snippet(
\ neosnippet#get_snippets(),
\ a:cur_text)
endif
if cur_word != '' if cur_word != ''
" Found snippet trigger. " Found snippet trigger.

1
doc/neosnippet.txt
View File

@ -396,6 +396,7 @@ CHANGELOG *neosnippet-changelog*
- Refactored snippets filter. - Refactored snippets filter.
- Changed :NeoSnippetEdit behavior. - Changed :NeoSnippetEdit behavior.
- Added scala snip. - Added scala snip.
- Fixed s:get_cursor_snippet().
2012-10-01 2012-10-01
- Deleted neosnippet#force_expandable(). - Deleted neosnippet#force_expandable().