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

- Improved for filetype.

Browse Source
This commit is contained in:
Shougo Matsushita 2012-09-30 17:33:50 +09:00
parent 67b59e9a1b
commit 9b4b9e6a02
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
autoload/neosnippet.vim
View File

@ -177,7 +177,7 @@ endfunction"}}}
function! neosnippet#caching()"{{{ function! neosnippet#caching()"{{{
for filetype in neocomplcache#get_source_filetypes( for filetype in neocomplcache#get_source_filetypes(
\ neocomplcache#get_context_filetype(1)) \ neosnippet#get_filetype())
if !has_key(s:snippets, filetype) if !has_key(s:snippets, filetype)
call neosnippet#caching_snippets(filetype) call neosnippet#caching_snippets(filetype)
endif endif
@ -235,10 +235,9 @@ function! s:set_snippet_pattern(dict)"{{{
endfunction"}}} endfunction"}}}
function! s:edit_snippets(filetype, isruntime)"{{{ function! s:edit_snippets(filetype, isruntime)"{{{
if a:filetype == ''
let filetype = neocomplcache#get_context_filetype(1)
else
let filetype = a:filetype let filetype = a:filetype
if filetype == ''
let filetype = neosnippet#get_filetype()
endif endif
" Edit snippet file. " Edit snippet file.
@ -373,7 +372,7 @@ endfunction"}}}
function! s:get_prev_word(cur_keyword_str)"{{{ function! s:get_prev_word(cur_keyword_str)"{{{
let keyword_pattern = '\S\+' let keyword_pattern = '\S\+'
let line_part = neocomplcache#get_cur_text()[: -1-len(a:cur_keyword_str)] let line_part = neosnippet#util#get_cur_text()[: -1-len(a:cur_keyword_str)]
let prev_word_end = matchend(line_part, keyword_pattern) let prev_word_end = matchend(line_part, keyword_pattern)
if prev_word_end > 0 if prev_word_end > 0
let word_end = matchend(line_part, keyword_pattern, prev_word_end) let word_end = matchend(line_part, keyword_pattern, prev_word_end)
@ -799,7 +798,7 @@ function! neosnippet#get_snippets()"{{{
endif endif
" Get buffer filetype. " Get buffer filetype.
let filetype = neocomplcache#get_context_filetype(1) let filetype = neosnippet#get_filetype()
let snippets = {} let snippets = {}
for source in neocomplcache#get_sources_list(s:snippets, filetype) for source in neocomplcache#get_sources_list(s:snippets, filetype)
@ -812,6 +811,10 @@ endfunction"}}}
function! neosnippet#get_snippets_dir()"{{{ function! neosnippet#get_snippets_dir()"{{{
return s:snippets_dir return s:snippets_dir
endfunction"}}} endfunction"}}}
function! neosnippet#get_filetype()"{{{
return exists('*neocomplcache#get_context_filetype') ?
\ neocomplcache#get_context_filetype(1) : &filetype
endfunction"}}}
function! s:get_placeholder_marker_pattern()"{{{ function! s:get_placeholder_marker_pattern()"{{{
return '<`\d\+\%(:.\{-}\)\?\\\@<!`>' return '<`\d\+\%(:.\{-}\)\?\\\@<!`>'

1
doc/neosnippet.txt
View File

@ -325,6 +325,7 @@ CHANGELOG *neosnippet-changelog*
- Deleted neocomplcache#util functions. - Deleted neocomplcache#util functions.
- Refactored variables. - Refactored variables.
- Deleted s:get_cursor_keyword_snippet(). - Deleted s:get_cursor_keyword_snippet().
- Improved for filetype.
2012-09-27 2012-09-27
- Ver.3 development is started. - Ver.3 development is started.