Change function name
This commit is contained in:
parent
a7c5fc843e
commit
b2e90869af
@ -122,7 +122,7 @@ function! neosnippet#commands#_make_cache(filetype) "{{{
|
|||||||
let snippets = neosnippet#variables#snippets()
|
let snippets = neosnippet#variables#snippets()
|
||||||
for snippets_file in reverse(s:get_list().uniq(snippets_files))
|
for snippets_file in reverse(s:get_list().uniq(snippets_files))
|
||||||
let snippets[filetype] = extend(snippets[filetype],
|
let snippets[filetype] = extend(snippets[filetype],
|
||||||
\ neosnippet#parser#_parse(snippets_file))
|
\ neosnippet#parser#_parse_snippets(snippets_file))
|
||||||
endfor
|
endfor
|
||||||
endfunction"}}}
|
endfunction"}}}
|
||||||
|
|
||||||
@ -131,7 +131,7 @@ function! neosnippet#commands#_source(filename) "{{{
|
|||||||
|
|
||||||
let neosnippet = neosnippet#variables#current_neosnippet()
|
let neosnippet = neosnippet#variables#current_neosnippet()
|
||||||
let neosnippet.snippets = extend(neosnippet.snippets,
|
let neosnippet.snippets = extend(neosnippet.snippets,
|
||||||
\ neosnippet#parser#_parse(a:filename))
|
\ neosnippet#parser#_parse_snippets(a:filename))
|
||||||
endfunction"}}}
|
endfunction"}}}
|
||||||
|
|
||||||
function! neosnippet#commands#_clear_markers() "{{{
|
function! neosnippet#commands#_clear_markers() "{{{
|
||||||
|
@ -28,23 +28,23 @@ set cpo&vim
|
|||||||
|
|
||||||
let s:Cache = neosnippet#util#get_vital().import('System.Cache')
|
let s:Cache = neosnippet#util#get_vital().import('System.Cache')
|
||||||
|
|
||||||
function! neosnippet#parser#_parse(snippets_file) "{{{
|
function! neosnippet#parser#_parse_snippets(filename) "{{{
|
||||||
if !filereadable(a:snippets_file)
|
if !filereadable(a:filename)
|
||||||
call neosnippet#util#print_error(
|
call neosnippet#util#print_error(
|
||||||
\ printf('snippet file "%s" is not found.', a:snippets_file))
|
\ printf('snippet file "%s" is not found.', a:filename))
|
||||||
return {}
|
return {}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
let cache_dir = neosnippet#variables#data_dir()
|
let cache_dir = neosnippet#variables#data_dir()
|
||||||
if s:Cache.check_old_cache(cache_dir, a:snippets_file)
|
if s:Cache.check_old_cache(cache_dir, a:filename)
|
||||||
let snippets = s:parse(a:snippets_file)
|
let snippets = s:parse(a:filename)
|
||||||
if len(snippets) > 5 && !neosnippet#util#is_sudo()
|
if len(snippets) > 5 && !neosnippet#util#is_sudo()
|
||||||
call s:Cache.writefile(
|
call s:Cache.writefile(
|
||||||
\ cache_dir, a:snippets_file, [string(snippets)])
|
\ cache_dir, a:filename, [string(snippets)])
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
sandbox let snippets = eval(
|
sandbox let snippets = eval(
|
||||||
\ s:Cache.readfile(cache_dir, a:snippets_file)[0])
|
\ s:Cache.readfile(cache_dir, a:filename)[0])
|
||||||
endif
|
endif
|
||||||
|
|
||||||
return snippets
|
return snippets
|
||||||
@ -72,7 +72,7 @@ function! s:parse(snippets_file) "{{{
|
|||||||
\ neosnippet#helpers#get_snippets_directory(), ','),
|
\ neosnippet#helpers#get_snippets_directory(), ','),
|
||||||
\ filename), '\n')
|
\ filename), '\n')
|
||||||
let snippets = extend(snippets,
|
let snippets = extend(snippets,
|
||||||
\ neosnippet#parser#_parse(snippets_file))
|
\ neosnippet#parser#_parse_snippets(snippets_file))
|
||||||
endfor
|
endfor
|
||||||
elseif line =~ '^delete\s'
|
elseif line =~ '^delete\s'
|
||||||
let name = matchstr(line, '^delete\s\+\zs.*$')
|
let name = matchstr(line, '^delete\s\+\zs.*$')
|
||||||
|
Loading…
Reference in New Issue
Block a user