diff --git a/autoload/neocomplcache/sources/snippets_complete.vim b/autoload/neocomplcache/sources/snippets_complete.vim index d1fcb57..658dc53 100644 --- a/autoload/neocomplcache/sources/snippets_complete.vim +++ b/autoload/neocomplcache/sources/snippets_complete.vim @@ -11,15 +11,15 @@ let s:source = { \ g:neocomplcache_auto_completion_start_length, \} -function! s:source.initialize() abort "{{{ +function! s:source.initialize() abort " Initialize. call neocomplcache#set_dictionary_helper( \ g:neocomplcache_source_rank, 'snippets_complete', 8) call neocomplcache#set_completion_length('snippets_complete', \ g:neocomplcache_auto_completion_start_length) -endfunction"}}} +endfunction -function! s:source.get_keyword_pos(cur_text) abort "{{{ +function! s:source.get_keyword_pos(cur_text) abort let cur_word = matchstr(a:cur_text, '\w\+$') let word_candidates = neocomplcache#keyword_filter( \ filter(values(neosnippet#helpers#get_snippets()), @@ -29,9 +29,9 @@ function! s:source.get_keyword_pos(cur_text) abort "{{{ endif return match(a:cur_text, '\S\+$') -endfunction"}}} +endfunction -function! s:source.get_complete_words(cur_keyword_pos, cur_keyword_str) abort "{{{ +function! s:source.get_complete_words(cur_keyword_pos, cur_keyword_str) abort let list = s:keyword_filter(neosnippet#helpers#get_snippets(), a:cur_keyword_str) for snippet in list @@ -42,9 +42,9 @@ function! s:source.get_complete_words(cur_keyword_pos, cur_keyword_str) abort "{ endfor return list -endfunction"}}} +endfunction -function! s:keyword_filter(snippets, cur_keyword_str) abort "{{{ +function! s:keyword_filter(snippets, cur_keyword_str) abort " Uniq by real_name. let dict = {} @@ -65,10 +65,8 @@ function! s:keyword_filter(snippets, cur_keyword_str) abort "{{{ endfor return values(dict) -endfunction"}}} +endfunction -function! neocomplcache#sources#snippets_complete#define() abort "{{{ +function! neocomplcache#sources#snippets_complete#define() abort return s:source -endfunction"}}} - -" vim: foldmethod=marker +endfunction diff --git a/autoload/neocomplete/sources/neosnippet.vim b/autoload/neocomplete/sources/neosnippet.vim index a99d319..dea9303 100644 --- a/autoload/neocomplete/sources/neosnippet.vim +++ b/autoload/neocomplete/sources/neosnippet.vim @@ -15,7 +15,7 @@ let s:source = { \ ['matcher_fuzzy'] : ['matcher_head']), \} -function! s:source.gather_candidates(context) abort "{{{ +function! s:source.gather_candidates(context) abort let snippets = values(neosnippet#helpers#get_completion_snippets()) if matchstr(a:context.input, '\S\+$') !=# \ matchstr(a:context.input, '\w\+$') @@ -23,9 +23,9 @@ function! s:source.gather_candidates(context) abort "{{{ call filter(snippets, 'v:val.options.word') endif return snippets -endfunction"}}} +endfunction -function! s:source.hooks.on_post_filter(context) abort "{{{ +function! s:source.hooks.on_post_filter(context) abort for snippet in a:context.candidates let snippet.dup = 1 let snippet.menu = neosnippet#util#strwidthpart( @@ -33,10 +33,8 @@ function! s:source.hooks.on_post_filter(context) abort "{{{ endfor return a:context.candidates -endfunction"}}} +endfunction -function! neocomplete#sources#neosnippet#define() abort "{{{ +function! neocomplete#sources#neosnippet#define() abort return s:source -endfunction"}}} - -" vim: foldmethod=marker +endfunction diff --git a/autoload/neosnippet.vim b/autoload/neosnippet.vim index 202b774..7e4c3a7 100644 --- a/autoload/neosnippet.vim +++ b/autoload/neosnippet.vim @@ -4,7 +4,7 @@ " License: MIT license "============================================================================= -" Global options definition. "{{{ +" Global options definition. call neosnippet#util#set_default( \ 'g:neosnippet#disable_runtime_snippets', {}) call neosnippet#util#set_default( @@ -31,64 +31,62 @@ call neosnippet#util#set_default( call neosnippet#util#set_default( \ 'g:neosnippet#_completed_pairs', \ {'_':{ '(' : ')', '{' : '}', '"' : '"', '[' : ']' }}) -"}}} -function! neosnippet#expandable_or_jumpable() abort "{{{ + +function! neosnippet#expandable_or_jumpable() abort return neosnippet#mappings#expandable_or_jumpable() -endfunction"}}} -function! neosnippet#expandable() abort "{{{ +endfunction +function! neosnippet#expandable() abort return neosnippet#mappings#expandable() -endfunction"}}} -function! neosnippet#jumpable() abort "{{{ +endfunction +function! neosnippet#jumpable() abort return neosnippet#mappings#jumpable() -endfunction"}}} -function! neosnippet#anonymous(snippet) abort "{{{ +endfunction +function! neosnippet#anonymous(snippet) abort return neosnippet#mappings#_anonymous(a:snippet) -endfunction"}}} -function! neosnippet#expand(trigger) abort "{{{ +endfunction +function! neosnippet#expand(trigger) abort return neosnippet#mappings#_expand(a:trigger) -endfunction"}}} +endfunction -function! neosnippet#get_snippets_directory() abort "{{{ +function! neosnippet#get_snippets_directory() abort return neosnippet#helpers#get_snippets_directory() -endfunction"}}} -function! neosnippet#get_user_snippets_directory() abort "{{{ +endfunction +function! neosnippet#get_user_snippets_directory() abort return copy(neosnippet#variables#snippets_dir()) -endfunction"}}} -function! neosnippet#get_runtime_snippets_directory() abort "{{{ +endfunction +function! neosnippet#get_runtime_snippets_directory() abort return copy(neosnippet#variables#runtime_dir()) -endfunction"}}} +endfunction " Get marker patterns. -function! neosnippet#get_placeholder_target_marker_pattern() abort "{{{ +function! neosnippet#get_placeholder_target_marker_pattern() abort return '\%(\\\@' -endfunction"}}} -function! neosnippet#get_placeholder_marker_substitute_pattern() abort "{{{ +endfunction +function! neosnippet#get_placeholder_marker_substitute_pattern() abort return '\%(\\\@' -endfunction"}}} -function! neosnippet#get_sync_placeholder_marker_pattern() abort "{{{ +endfunction +function! neosnippet#get_sync_placeholder_marker_pattern() abort return '<{\d\+\%(:.\{-}\)\?\\\@' -endfunction"}}} -function! neosnippet#get_sync_placeholder_marker_default_pattern() abort "{{{ +endfunction +function! neosnippet#get_sync_placeholder_marker_default_pattern() abort return '<{\d\+:\zs.\{-}\ze\\\@' -endfunction"}}} -function! neosnippet#get_mirror_placeholder_marker_pattern() abort "{{{ +endfunction +function! neosnippet#get_mirror_placeholder_marker_pattern() abort return '<|\d\+|>' -endfunction"}}} -function! neosnippet#get_mirror_placeholder_marker_substitute_pattern() abort "{{{ +endfunction +function! neosnippet#get_mirror_placeholder_marker_substitute_pattern() abort return '\\\@ 0 -endfunction"}}} -function! neosnippet#mappings#completed_expandable() abort "{{{ +endfunction +function! neosnippet#mappings#completed_expandable() abort if !s:enabled_completed_snippet() return 0 endif @@ -28,14 +28,14 @@ function! neosnippet#mappings#completed_expandable() abort "{{{ \ v:completed_item, neosnippet#util#get_cur_text(), \ neosnippet#util#get_next_text()) return snippet != '' -endfunction"}}} -function! s:enabled_completed_snippet() abort "{{{ +endfunction +function! s:enabled_completed_snippet() abort return exists('v:completed_item') \ && !empty(v:completed_item) \ && g:neosnippet#enable_completed_snippet -endfunction"}}} +endfunction -function! neosnippet#mappings#_clear_select_mode_mappings() abort "{{{ +function! neosnippet#mappings#_clear_select_mode_mappings() abort if !g:neosnippet#disable_select_mode_mappings return endif @@ -56,9 +56,9 @@ function! neosnippet#mappings#_clear_select_mode_mappings() abort "{{{ snoremap a snoremap a snoremap a -endfunction"}}} +endfunction -function! neosnippet#mappings#_register_oneshot_snippet() abort "{{{ +function! neosnippet#mappings#_register_oneshot_snippet() abort let trigger = input('Please input snippet trigger: ', 'oneshot') if trigger == '' return @@ -84,9 +84,9 @@ function! neosnippet#mappings#_register_oneshot_snippet() abort "{{{ \ '', 0, '', trigger) echo 'Registered trigger : ' . trigger -endfunction"}}} +endfunction -function! neosnippet#mappings#_expand_target() abort "{{{ +function! neosnippet#mappings#_expand_target() abort let trigger = input('Please input snippet trigger: ', \ '', 'customlist,neosnippet#commands#_complete_target_snippets') let neosnippet = neosnippet#variables#current_neosnippet() @@ -102,8 +102,8 @@ function! neosnippet#mappings#_expand_target() abort "{{{ endif call neosnippet#mappings#_expand_target_trigger(trigger) -endfunction"}}} -function! neosnippet#mappings#_expand_target_trigger(trigger) abort "{{{ +endfunction +function! neosnippet#mappings#_expand_target_trigger(trigger) abort let neosnippet = neosnippet#variables#current_neosnippet() let neosnippet.target = substitute( \ neosnippet#helpers#get_selected_text(visualmode(), 1), '\n$', '', '') @@ -128,25 +128,25 @@ function! neosnippet#mappings#_expand_target_trigger(trigger) abort "{{{ call cursor(0, col('.') - 1) stopinsert endif -endfunction"}}} +endfunction -function! neosnippet#mappings#_anonymous(snippet) abort "{{{ +function! neosnippet#mappings#_anonymous(snippet) abort let [cur_text, col, expr] = neosnippet#mappings#_pre_trigger() let expr .= printf("\:call neosnippet#view#_insert(%s, {}, %s, %d)\", \ string(a:snippet), string(cur_text), col) return expr -endfunction"}}} -function! neosnippet#mappings#_expand(trigger) abort "{{{ +endfunction +function! neosnippet#mappings#_expand(trigger) abort let [cur_text, col, expr] = neosnippet#mappings#_pre_trigger() let expr .= printf("\:call neosnippet#view#_expand(%s, %d, %s)\", \ string(cur_text), col, string(a:trigger)) return expr -endfunction"}}} +endfunction -function! s:snippets_expand(cur_text, col) abort "{{{ +function! s:snippets_expand(cur_text, col) abort if s:expand_completed_snippets(a:cur_text, a:col) return 0 endif @@ -162,8 +162,8 @@ function! s:snippets_expand(cur_text, col) abort "{{{ endif return 1 -endfunction"}}} -function! s:expand_completed_snippets(cur_text, col) abort "{{{ +endfunction +function! s:expand_completed_snippets(cur_text, col) abort if !s:enabled_completed_snippet() return 0 endif @@ -194,15 +194,15 @@ function! s:expand_completed_snippets(cur_text, col) abort "{{{ call neosnippet#view#_insert(snippet, {}, cur_text, a:col) return 1 -endfunction"}}} +endfunction -function! s:snippets_expand_or_jump(cur_text, col) abort "{{{ +function! s:snippets_expand_or_jump(cur_text, col) abort if s:snippets_expand(a:cur_text, a:col) call neosnippet#view#_jump('', a:col) endif -endfunction"}}} +endfunction -function! s:snippets_jump_or_expand(cur_text, col) abort "{{{ +function! s:snippets_jump_or_expand(cur_text, col) abort if search(neosnippet#get_placeholder_marker_pattern(). '\|' \ .neosnippet#get_sync_placeholder_marker_pattern(), 'nw') > 0 " Found snippet placeholder. @@ -210,13 +210,13 @@ function! s:snippets_jump_or_expand(cur_text, col) abort "{{{ else return s:snippets_expand(a:cur_text, a:col) endif -endfunction"}}} +endfunction -function! s:SID_PREFIX() abort "{{{ +function! s:SID_PREFIX() abort return matchstr(expand(''), '\d\+_\ze\w\+$') -endfunction"}}} +endfunction -function! neosnippet#mappings#_trigger(function) abort "{{{ +function! neosnippet#mappings#_trigger(function) abort let [cur_text, col, expr] = neosnippet#mappings#_pre_trigger() if !neosnippet#mappings#expandable_or_jumpable() @@ -227,9 +227,9 @@ function! neosnippet#mappings#_trigger(function) abort "{{{ \ a:function, string(cur_text), col) return expr -endfunction"}}} +endfunction -function! neosnippet#mappings#_pre_trigger() abort "{{{ +function! neosnippet#mappings#_pre_trigger() abort call neosnippet#init#check() let cur_text = neosnippet#util#get_cur_text() @@ -249,7 +249,7 @@ function! neosnippet#mappings#_pre_trigger() abort "{{{ endif return [cur_text, col, expr] -endfunction"}}} +endfunction " Plugin key-mappings. function! neosnippet#mappings#expand_or_jump_impl() abort @@ -270,5 +270,3 @@ endfunction function! neosnippet#mappings#jump_impl() abort return neosnippet#mappings#_trigger('neosnippet#view#_jump') endfunction - -" vim: foldmethod=marker diff --git a/autoload/neosnippet/parser.vim b/autoload/neosnippet/parser.vim index 71643f9..abbc0a5 100644 --- a/autoload/neosnippet/parser.vim +++ b/autoload/neosnippet/parser.vim @@ -6,7 +6,7 @@ let s:Cache = neosnippet#util#get_vital().import('System.Cache.Deprecated') -function! neosnippet#parser#_parse_snippets(filename) abort "{{{ +function! neosnippet#parser#_parse_snippets(filename) abort if !filereadable(a:filename) call neosnippet#util#print_error( \ printf('snippet file "%s" is not found.', a:filename)) @@ -32,8 +32,8 @@ function! neosnippet#parser#_parse_snippets(filename) abort "{{{ endif return snippets -endfunction"}}} -function! neosnippet#parser#_parse_snippet(filename, trigger) abort "{{{ +endfunction +function! neosnippet#parser#_parse_snippet(filename, trigger) abort if !filereadable(a:filename) call neosnippet#util#print_error( \ printf('snippet file "%s" is not found.', a:filename)) @@ -48,9 +48,9 @@ function! neosnippet#parser#_parse_snippet(filename, trigger) abort "{{{ return neosnippet#parser#_initialize_snippet( \ snippet_dict, a:filename, 1, '', a:trigger) -endfunction"}}} +endfunction -function! s:parse(snippets_file) abort "{{{ +function! s:parse(snippets_file) abort let dup_check = {} let snippet_dict = {} let linenr = 1 @@ -120,9 +120,9 @@ function! s:parse(snippets_file) abort "{{{ endif return [snippets, sourced] -endfunction"}}} +endfunction -function! s:parse_snippet_name(snippets_file, line, linenr, dup_check) abort "{{{ +function! s:parse_snippet_name(snippets_file, line, linenr, dup_check) abort " Initialize snippet dict. let snippet_dict = { \ 'word' : '', @@ -162,9 +162,9 @@ function! s:parse_snippet_name(snippets_file, line, linenr, dup_check) abort "{{ endif return snippet_dict -endfunction"}}} +endfunction -function! s:add_snippet_attribute(snippets_file, line, linenr, snippet_dict) abort "{{{ +function! s:add_snippet_attribute(snippets_file, line, linenr, snippet_dict) abort " Allow overriding/setting of the description (abbr) of the snippet. " This will override what was set via the snippet line. if a:line =~ '^abbr\s' @@ -203,9 +203,9 @@ function! s:add_snippet_attribute(snippets_file, line, linenr, snippet_dict) abo call neosnippet#util#print_error( \ printf('Invalid syntax : "%s"', a:line)) endif -endfunction"}}} +endfunction -function! s:set_snippet_dict(snippet_dict, snippets, dup_check, snippets_file) abort "{{{ +function! s:set_snippet_dict(snippet_dict, snippets, dup_check, snippets_file) abort if empty(a:snippet_dict) return endif @@ -225,9 +225,9 @@ function! s:set_snippet_dict(snippet_dict, snippets, dup_check, snippets_file) a let a:snippets[alias] = alias_snippet let a:dup_check[alias] = alias_snippet endfor -endfunction"}}} +endfunction -function! neosnippet#parser#_initialize_snippet(dict, path, line, pattern, name) abort "{{{ +function! neosnippet#parser#_initialize_snippet(dict, path, line, pattern, name) abort let a:dict.word = substitute(a:dict.word, '\n\+$', '', '') if a:dict.word !~ '\n' \ && a:dict.word !~ @@ -265,9 +265,9 @@ function! neosnippet#parser#_initialize_snippet(dict, path, line, pattern, name) endif return snippet -endfunction"}}} +endfunction -function! neosnippet#parser#_initialize_snippet_options() abort "{{{ +function! neosnippet#parser#_initialize_snippet_options() abort return { \ 'head' : 0, \ 'word' : @@ -275,9 +275,9 @@ function! neosnippet#parser#_initialize_snippet_options() abort "{{{ \ 'indent' : 0, \ 'oneshot' : 0, \ } -endfunction"}}} +endfunction -function! neosnippet#parser#_get_completed_snippet(completed_item, cur_text, next_text) abort "{{{ +function! neosnippet#parser#_get_completed_snippet(completed_item, cur_text, next_text) abort let item = a:completed_item if strridx(a:cur_text, item.word) != len(a:cur_text) - len(item.word) @@ -376,9 +376,9 @@ function! neosnippet#parser#_get_completed_snippet(completed_item, cur_text, nex let snippet .= '${' . cnt . '}' return snippet -endfunction"}}} +endfunction -function! neosnippet#parser#_get_in_paren(key, pair, str) abort "{{{ +function! neosnippet#parser#_get_in_paren(key, pair, str) abort let s = '' let level = 0 for c in split(a:str, '\zs') @@ -402,9 +402,9 @@ function! neosnippet#parser#_get_in_paren(key, pair, str) abort "{{{ endfor return '' -endfunction"}}} +endfunction -function! neosnippet#parser#_conceal_argument(arg, cnt, args) abort "{{{ +function! neosnippet#parser#_conceal_argument(arg, cnt, args) abort let outside = '' let inside = '' if (a:args != '') @@ -415,5 +415,4 @@ function! neosnippet#parser#_conceal_argument(arg, cnt, args) abort "{{{ endif endif return printf('%s${%d:#:%s%s}', outside, a:cnt, inside, escape(a:arg, '{}')) -endfunction"}}} -" vim: foldmethod=marker +endfunction diff --git a/autoload/neosnippet/util.vim b/autoload/neosnippet/util.vim index 1b570cc..3c630ca 100644 --- a/autoload/neosnippet/util.vim +++ b/autoload/neosnippet/util.vim @@ -4,99 +4,99 @@ " License: MIT license "============================================================================= -function! neosnippet#util#get_vital() abort "{{{ +function! neosnippet#util#get_vital() abort if !exists('s:V') let s:V = vital#neosnippet#new() endif return s:V -endfunction"}}} -function! s:get_prelude() abort "{{{ +endfunction +function! s:get_prelude() abort if !exists('s:Prelude') let s:Prelude = neosnippet#util#get_vital().import('Prelude') endif return s:Prelude -endfunction"}}} -function! s:get_list() abort "{{{ +endfunction +function! s:get_list() abort if !exists('s:List') let s:List = neosnippet#util#get_vital().import('Data.List') endif return s:List -endfunction"}}} -function! s:get_string() abort "{{{ +endfunction +function! s:get_string() abort if !exists('s:String') let s:String = neosnippet#util#get_vital().import('Data.String') endif return s:String -endfunction"}}} -function! s:get_process() abort "{{{ +endfunction +function! s:get_process() abort if !exists('s:Process') let s:Process = neosnippet#util#get_vital().import('Process') endif return s:Process -endfunction"}}} +endfunction -function! neosnippet#util#substitute_path_separator(...) abort "{{{ +function! neosnippet#util#substitute_path_separator(...) abort return call(s:get_prelude().substitute_path_separator, a:000) -endfunction"}}} -function! neosnippet#util#system(...) abort "{{{ +endfunction +function! neosnippet#util#system(...) abort return call(s:get_process().system, a:000) -endfunction"}}} -function! neosnippet#util#has_vimproc(...) abort "{{{ +endfunction +function! neosnippet#util#has_vimproc(...) abort return call(s:get_process().has_vimproc, a:000) -endfunction"}}} -function! neosnippet#util#is_windows(...) abort "{{{ +endfunction +function! neosnippet#util#is_windows(...) abort return call(s:get_prelude().is_windows, a:000) -endfunction"}}} -function! neosnippet#util#is_mac(...) abort "{{{ +endfunction +function! neosnippet#util#is_mac(...) abort return call(s:get_prelude().is_mac, a:000) -endfunction"}}} -function! neosnippet#util#get_last_status(...) abort "{{{ +endfunction +function! neosnippet#util#get_last_status(...) abort return call(s:get_process().get_last_status, a:000) -endfunction"}}} -function! neosnippet#util#escape_pattern(...) abort "{{{ +endfunction +function! neosnippet#util#escape_pattern(...) abort return call(s:get_string().escape_pattern, a:000) -endfunction"}}} -function! neosnippet#util#iconv(...) abort "{{{ +endfunction +function! neosnippet#util#iconv(...) abort return call(s:get_process().iconv, a:000) -endfunction"}}} -function! neosnippet#util#truncate(...) abort "{{{ +endfunction +function! neosnippet#util#truncate(...) abort return call(s:get_string().truncate, a:000) -endfunction"}}} -function! neosnippet#util#strwidthpart(...) abort "{{{ +endfunction +function! neosnippet#util#strwidthpart(...) abort return call(s:get_string().strwidthpart, a:000) -endfunction"}}} +endfunction -function! neosnippet#util#expand(path) abort "{{{ +function! neosnippet#util#expand(path) abort return neosnippet#util#substitute_path_separator( \ expand(escape(a:path, '*?[]"={}'), 1)) -endfunction"}}} -function! neosnippet#util#set_default(var, val, ...) abort "{{{ +endfunction +function! neosnippet#util#set_default(var, val, ...) abort let old_var = get(a:000, 0, '') if exists(old_var) let {a:var} = {old_var} elseif !exists(a:var) let {a:var} = a:val endif -endfunction"}}} -function! neosnippet#util#set_dictionary_helper(...) abort "{{{ +endfunction +function! neosnippet#util#set_dictionary_helper(...) abort return call(s:get_prelude().set_dictionary_helper, a:000) -endfunction"}}} +endfunction -function! neosnippet#util#get_cur_text() abort "{{{ +function! neosnippet#util#get_cur_text() abort return \ (mode() ==# 'i' ? (col('.')-1) : col('.')) >= len(getline('.')) ? \ getline('.') : \ matchstr(getline('.'), \ '^.*\%' . col('.') . 'c' . (mode() ==# 'i' ? '' : '.')) -endfunction"}}} -function! neosnippet#util#get_next_text() abort "{{{ +endfunction +function! neosnippet#util#get_next_text() abort return getline('.')[len(neosnippet#util#get_cur_text()) :] -endfunction"}}} -function! neosnippet#util#print_error(string) abort "{{{ +endfunction +function! neosnippet#util#print_error(string) abort echohl Error | echomsg '[neosnippet] ' . a:string | echohl None -endfunction"}}} +endfunction -function! neosnippet#util#parse_options(args, options_list) abort "{{{ +function! neosnippet#util#parse_options(args, options_list) abort let args = [] let options = {} for arg in split(a:args, '\%(\\\@ a:end return endif @@ -187,9 +187,9 @@ function! s:indent_snippet(begin, end) abort "{{{ let &l:equalprg = equalprg call setpos('.', pos) endtry -endfunction"}}} +endfunction -function! neosnippet#view#_get_snippet_range(begin_line, begin_patterns, end_line, end_patterns) abort "{{{ +function! neosnippet#view#_get_snippet_range(begin_line, begin_patterns, end_line, end_patterns) abort let pos = getpos('.') call cursor(a:begin_line, 0) @@ -227,8 +227,8 @@ function! neosnippet#view#_get_snippet_range(begin_line, begin_patterns, end_lin call setpos('.', pos) return [begin, end] -endfunction"}}} -function! neosnippet#view#_search_snippet_range(start, end, cnt, ...) abort "{{{ +endfunction +function! neosnippet#view#_search_snippet_range(start, end, cnt, ...) abort let is_select = get(a:000, 0, 1) call s:substitute_placeholder_marker(a:start, a:end, a:cnt) @@ -250,8 +250,8 @@ function! neosnippet#view#_search_snippet_range(start, end, cnt, ...) abort "{{{ endfor return 0 -endfunction"}}} -function! neosnippet#view#_search_outof_range(col) abort "{{{ +endfunction +function! neosnippet#view#_search_outof_range(col) abort call s:substitute_placeholder_marker(1, 0, 0) let pattern = neosnippet#get_placeholder_marker_pattern() @@ -275,8 +275,8 @@ function! neosnippet#view#_search_outof_range(col) abort "{{{ " Not found. return 0 -endfunction"}}} -function! neosnippet#view#_clear_markers(expand_info) abort "{{{ +endfunction +function! neosnippet#view#_clear_markers(expand_info) abort " Search patterns. let [begin, end] = neosnippet#view#_get_snippet_range( \ a:expand_info.begin_line, @@ -311,8 +311,8 @@ function! neosnippet#view#_clear_markers(expand_info) abort "{{{ call neosnippet#variables#pop_expand_stack() endtry -endfunction"}}} -function! s:expand_placeholder(start, end, holder_cnt, line, ...) abort "{{{ +endfunction +function! s:expand_placeholder(start, end, holder_cnt, line, ...) abort let is_select = get(a:000, 0, 1) let pattern = substitute(neosnippet#get_placeholder_marker_pattern(), @@ -401,8 +401,8 @@ function! s:expand_placeholder(start, end, holder_cnt, line, ...) abort "{{{ else startinsert! endif -endfunction"}}} -function! s:expand_target_placeholder(line, col) abort "{{{ +endfunction +function! s:expand_target_placeholder(line, col) abort " Expand target let neosnippet = neosnippet#variables#current_neosnippet() let next_line = getline(a:line)[a:col-1 :] @@ -461,8 +461,8 @@ function! s:expand_target_placeholder(line, col) abort "{{{ let neosnippet.target = '' call neosnippet#view#_jump('', col) -endfunction"}}} -function! s:search_sync_placeholder(start, end, number) abort "{{{ +endfunction +function! s:search_sync_placeholder(start, end, number) abort if a:end == 0 " Search in current buffer. let cnt = matchstr(getline('.'), @@ -482,8 +482,8 @@ function! s:search_sync_placeholder(start, end, number) abort "{{{ endif return -1 -endfunction"}}} -function! s:substitute_placeholder_marker(start, end, snippet_holder_cnt) abort "{{{ +endfunction +function! s:substitute_placeholder_marker(start, end, snippet_holder_cnt) abort if a:snippet_holder_cnt > 0 let cnt = a:snippet_holder_cnt-1 let sync_marker = substitute(neosnippet#get_sync_placeholder_marker_pattern(), @@ -518,8 +518,8 @@ function! s:substitute_placeholder_marker(start, end, snippet_holder_cnt) abort \ '\\d\\+', cnt, '') call setline('.', substitute(getline('.'), sync_marker, sub, '')) endif -endfunction"}}} -function! s:eval_snippet(snippet_text) abort "{{{ +endfunction +function! s:eval_snippet(snippet_text) abort let snip_word = '' let prev_match = 0 let match = match(a:snippet_text, '\\\@ (neosnippet_expand_or_jump) \ neosnippet#mappings#expand_or_jump_impl() inoremap (neosnippet_jump_or_expand) @@ -39,13 +39,13 @@ xnoremap (neosnippet_register_oneshot_snippet) inoremap (neosnippet_start_unite_snippet) \ unite#sources#neosnippet#start_complete() -"}}} -augroup neosnippet "{{{ + +augroup neosnippet autocmd InsertEnter * call neosnippet#init#_initialize() -augroup END"}}} +augroup END -" Commands. "{{{ +" Commands. command! -nargs=? -bar \ -complete=customlist,neosnippet#commands#_edit_complete \ NeoSnippetEdit @@ -62,9 +62,6 @@ command! -nargs=1 -bar -complete=file command! -bar NeoSnippetClearMarkers \ call neosnippet#commands#_clear_markers() -"}}} -let g:loaded_neosnippet = 1 -" __END__ -" vim: foldmethod=marker +let g:loaded_neosnippet = 1