From eafef3c2d3262821ba601887c544424d21a793e4 Mon Sep 17 00:00:00 2001 From: Shougo Matsushita Date: Tue, 31 Dec 2013 07:50:41 +0900 Subject: [PATCH] Rename snippet to neosnippet --- .../sources/{snippet.vim => neosnippet.vim} | 13 ++++--- ...ippet_target.vim => neosnippet_target.vim} | 34 ++++++++----------- doc/neosnippet.txt | 12 +++---- ftdetect/snippet.vim | 2 +- plugin/neosnippet.vim | 6 ++-- syntax/{snippet.vim => neosnippet.vim} | 0 6 files changed, 30 insertions(+), 37 deletions(-) rename autoload/unite/sources/{snippet.vim => neosnippet.vim} (95%) rename autoload/unite/sources/{snippet_target.vim => neosnippet_target.vim} (82%) rename syntax/{snippet.vim => neosnippet.vim} (100%) diff --git a/autoload/unite/sources/snippet.vim b/autoload/unite/sources/neosnippet.vim similarity index 95% rename from autoload/unite/sources/snippet.vim rename to autoload/unite/sources/neosnippet.vim index ec0fcf1..cdf5a5b 100644 --- a/autoload/unite/sources/snippet.vim +++ b/autoload/unite/sources/neosnippet.vim @@ -27,9 +27,9 @@ let s:save_cpo = &cpo set cpo&vim -function! unite#sources#snippet#define() "{{{ +function! unite#sources#neosnippet#define() "{{{ let kind = { - \ 'name' : 'snippet', + \ 'name' : 'neosnippet', \ 'default_action' : 'expand', \ 'action_table': {}, \ 'parents': ['jump_list', 'completion'], @@ -42,7 +42,7 @@ endfunction "}}} " neosnippet source. let s:source = { - \ 'name': 'snippet', + \ 'name': 'neosnippet', \ 'hooks' : {}, \ 'action_table' : {}, \ } @@ -58,8 +58,7 @@ function! s:source.gather_candidates(args, context) "{{{ return map(copy(a:context.source__snippets), "{ \ 'word' : v:val.word, \ 'abbr' : printf('%-50s %s', v:val.word, v:val.menu_abbr), - \ 'kind' : 'snippet', - \ 'dup' : 1, + \ 'kind' : 'neosnippet', \ 'action__complete_word' : v:val.word, \ 'action__complete_pos' : a:context.source__cur_keyword_pos, \ 'action__path' : v:val.action__path, @@ -67,7 +66,7 @@ function! s:source.gather_candidates(args, context) "{{{ \ 'source__menu' : v:val.menu_abbr, \ 'source__snip' : v:val.snip, \ 'source__snip_ref' : v:val, - \ "}) + \ }") endfunction "}}} " Actions "{{{ @@ -138,7 +137,7 @@ let s:source.action_table = s:action_table unlet! s:action_table "}}} -function! unite#sources#snippet#start_complete() "{{{ +function! unite#sources#neosnippet#start_complete() "{{{ if !exists(':Unite') call neosnippet#util#print_error( \ 'unite.vim is not installed.') diff --git a/autoload/unite/sources/snippet_target.vim b/autoload/unite/sources/neosnippet_target.vim similarity index 82% rename from autoload/unite/sources/snippet_target.vim rename to autoload/unite/sources/neosnippet_target.vim index b5addbe..eabcc74 100644 --- a/autoload/unite/sources/snippet_target.vim +++ b/autoload/unite/sources/neosnippet_target.vim @@ -1,7 +1,7 @@ "============================================================================= " FILE: snippet_target.vim " AUTHOR: Shougo Matsushita -" Last Modified: 21 Nov 2013. +" Last Modified: 31 Dec 2013. " License: MIT license {{{ " Permission is hereby granted, free of charge, to any person obtaining " a copy of this software and associated documentation files (the @@ -27,7 +27,7 @@ let s:save_cpo = &cpo set cpo&vim -function! unite#sources#snippet_target#define() "{{{ +function! unite#sources#neosnippet_target#define() "{{{ if !exists('*unite#version') || unite#version() < 150 echoerr 'Your unite.vim is too old.' return [] @@ -37,7 +37,7 @@ function! unite#sources#snippet_target#define() "{{{ endfunction "}}} let s:source = { - \ 'name': 'snippet/target', + \ 'name': 'neosnippet/target', \ 'hooks' : {}, \ 'default_action' : 'select', \ 'action_table' : {}, @@ -54,20 +54,13 @@ function! s:source.hooks.on_init(args, context) "{{{ endfunction"}}} function! s:source.gather_candidates(args, context) "{{{ - let list = [] - for keyword in a:context.source__snippets - let dict = { - \ 'word' : printf('%-50s %s', keyword.word, keyword.menu_abbr), - \ 'source__trigger' : keyword.word, - \ 'source__menu' : keyword.menu_abbr, - \ 'source__snip' : keyword.snip, + return map(copy(a:context.source__snippets), "{ + \ 'word' : printf('%-50s %s', v:val.word, v:val.menu_abbr), + \ 'source__trigger' : v:val.word, + \ 'source__menu' : v:val.menu_abbr, + \ 'source__snip' : v:val.snip, \ 'source__context' : a:context, - \ } - - call add(list, dict) - endfor - - return list + \ }") endfunction "}}} " Actions "{{{ @@ -82,11 +75,12 @@ function! s:source.action_table.select.func(candidate) "{{{ return endif - call neosnippet#mappings#_expand_target_trigger(a:candidate.source__trigger) + call neosnippet#mappings#_expand_target_trigger( + \ a:candidate.source__trigger) endfunction"}}} "}}} -function! unite#sources#snippet_target#start() "{{{ +function! unite#sources#neosnippet_target#start() "{{{ if !exists(':Unite') call neosnippet#util#print_error( \ 'unite.vim is not installed.') @@ -101,8 +95,8 @@ function! unite#sources#snippet_target#start() "{{{ return '' endif - return unite#start_complete(['snippet/target'], - \ { 'buffer_name' : 'snippet/target' }) + return unite#start_complete(['neosnippet/target'], + \ { 'buffer_name' : 'neosnippet/target' }) endfunction "}}} function! s:get_keyword_pos(cur_text) "{{{ diff --git a/doc/neosnippet.txt b/doc/neosnippet.txt index 1c919d8..fcdb618 100755 --- a/doc/neosnippet.txt +++ b/doc/neosnippet.txt @@ -642,14 +642,14 @@ insert empty line in snippet end, you must insert placeholder. ============================================================================== UNITE SOURCES *neosnippet-unite-sources* - *neosnippet-unite-source-snippet* -snippet + *neosnippet-unite-source-neosnippet* +neosnippet The candidates of the snippet source are neosnippet snippets. and their kind is "snippet". You can use the snippet source with the mapping |(neosnippet_start_unite_snippet)|. - But you can also execute it by ":Unite snippet". The snippet - source offers an edit action you can use to edit the snippet - files. + But you can also execute it by ":Unite neosnippet". The + snippet source offers an edit action you can use to edit the + snippet files. Example: > @@ -665,7 +665,7 @@ neosnippet/runtime source actions -snippet *neosnippet-unite-action-snippet* +neosnippet *neosnippet-unite-action-neosnippet* expand Expand snippet (default action) edit Edit snippet preview View snippet definition diff --git a/ftdetect/snippet.vim b/ftdetect/snippet.vim index 61cb802..dca1522 100644 --- a/ftdetect/snippet.vim +++ b/ftdetect/snippet.vim @@ -1,2 +1,2 @@ " Detect syntax file. -autocmd BufNewFile,BufRead *.snip,*.snippets set filetype=snippet +autocmd BufNewFile,BufRead *.snip,*.snippets set filetype=neosnippet diff --git a/plugin/neosnippet.vim b/plugin/neosnippet.vim index e6e19c5..0fae8e0 100644 --- a/plugin/neosnippet.vim +++ b/plugin/neosnippet.vim @@ -1,7 +1,7 @@ "============================================================================= " FILE: neosnippet.vim " AUTHOR: Shougo Matsushita -" Last Modified: 25 Dec 2013. +" Last Modified: 31 Dec 2013. " License: MIT license {{{ " Permission is hereby granted, free of charge, to any person obtaining " a copy of this software and associated documentation files (the @@ -61,12 +61,12 @@ xnoremap (neosnippet_get_selected_text) xnoremap (neosnippet_expand_target) \ :call neosnippet#mappings#_expand_target() xnoremap (neosnippet_start_unite_snippet_target) - \ unite#sources#snippet_target#start() + \ unite#sources#neosnippet_target#start() xnoremap (neosnippet_register_oneshot_snippet) \ :call neosnippet#mappings#_register_oneshot_snippet() inoremap (neosnippet_start_unite_snippet) - \ unite#sources#snippet#start_complete() + \ unite#sources#neosnippet#start_complete() "}}} augroup neosnippet "{{{ diff --git a/syntax/snippet.vim b/syntax/neosnippet.vim similarity index 100% rename from syntax/snippet.vim rename to syntax/neosnippet.vim