From b2e90869affaac529feb2949fe3ecc20eab1a461 Mon Sep 17 00:00:00 2001 From: Shougo Matsushita Date: Fri, 23 Oct 2015 14:23:52 +0900 Subject: [PATCH] Change function name --- autoload/neosnippet/commands.vim | 4 ++-- autoload/neosnippet/parser.vim | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/autoload/neosnippet/commands.vim b/autoload/neosnippet/commands.vim index ad5140f..bc8f78e 100644 --- a/autoload/neosnippet/commands.vim +++ b/autoload/neosnippet/commands.vim @@ -122,7 +122,7 @@ function! neosnippet#commands#_make_cache(filetype) "{{{ let snippets = neosnippet#variables#snippets() for snippets_file in reverse(s:get_list().uniq(snippets_files)) let snippets[filetype] = extend(snippets[filetype], - \ neosnippet#parser#_parse(snippets_file)) + \ neosnippet#parser#_parse_snippets(snippets_file)) endfor endfunction"}}} @@ -131,7 +131,7 @@ function! neosnippet#commands#_source(filename) "{{{ let neosnippet = neosnippet#variables#current_neosnippet() let neosnippet.snippets = extend(neosnippet.snippets, - \ neosnippet#parser#_parse(a:filename)) + \ neosnippet#parser#_parse_snippets(a:filename)) endfunction"}}} function! neosnippet#commands#_clear_markers() "{{{ diff --git a/autoload/neosnippet/parser.vim b/autoload/neosnippet/parser.vim index ec4df16..2b96e55 100644 --- a/autoload/neosnippet/parser.vim +++ b/autoload/neosnippet/parser.vim @@ -28,23 +28,23 @@ set cpo&vim let s:Cache = neosnippet#util#get_vital().import('System.Cache') -function! neosnippet#parser#_parse(snippets_file) "{{{ - if !filereadable(a:snippets_file) +function! neosnippet#parser#_parse_snippets(filename) "{{{ + if !filereadable(a:filename) 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 {} endif let cache_dir = neosnippet#variables#data_dir() - if s:Cache.check_old_cache(cache_dir, a:snippets_file) - let snippets = s:parse(a:snippets_file) + if s:Cache.check_old_cache(cache_dir, a:filename) + let snippets = s:parse(a:filename) if len(snippets) > 5 && !neosnippet#util#is_sudo() call s:Cache.writefile( - \ cache_dir, a:snippets_file, [string(snippets)]) + \ cache_dir, a:filename, [string(snippets)]) endif else sandbox let snippets = eval( - \ s:Cache.readfile(cache_dir, a:snippets_file)[0]) + \ s:Cache.readfile(cache_dir, a:filename)[0]) endif return snippets @@ -72,7 +72,7 @@ function! s:parse(snippets_file) "{{{ \ neosnippet#helpers#get_snippets_directory(), ','), \ filename), '\n') let snippets = extend(snippets, - \ neosnippet#parser#_parse(snippets_file)) + \ neosnippet#parser#_parse_snippets(snippets_file)) endfor elseif line =~ '^delete\s' let name = matchstr(line, '^delete\s\+\zs.*$')