From 23327c4379b45798fb5b3e644adb77208c8ce68d Mon Sep 17 00:00:00 2001 From: Shougo Matsushita Date: Mon, 27 Oct 2014 19:27:04 +0900 Subject: [PATCH] Fix #257 remove (neosnippet_expand_target) --- autoload/unite/sources/neosnippet_target.vim | 114 ------------------- doc/neosnippet.txt | 7 -- plugin/neosnippet.vim | 2 - 3 files changed, 123 deletions(-) delete mode 100644 autoload/unite/sources/neosnippet_target.vim diff --git a/autoload/unite/sources/neosnippet_target.vim b/autoload/unite/sources/neosnippet_target.vim deleted file mode 100644 index 0fc545a..0000000 --- a/autoload/unite/sources/neosnippet_target.vim +++ /dev/null @@ -1,114 +0,0 @@ -"============================================================================= -" FILE: neosnippet_target.vim -" AUTHOR: Shougo Matsushita -" License: MIT license {{{ -" Permission is hereby granted, free of charge, to any person obtaining -" a copy of this software and associated documentation files (the -" "Software"), to deal in the Software without restriction, including -" without limitation the rights to use, copy, modify, merge, publish, -" distribute, sublicense, and/or sell copies of the Software, and to -" permit persons to whom the Software is furnished to do so, subject to -" the following conditions: -" -" The above copyright notice and this permission notice shall be included -" in all copies or substantial portions of the Software. -" -" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -" IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -" CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -" TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -" SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -" }}} -"============================================================================= - -let s:save_cpo = &cpo -set cpo&vim - -function! unite#sources#neosnippet_target#define() "{{{ - if !exists('*unite#version') || unite#version() < 150 - echoerr 'Your unite.vim is too old.' - return [] - endif - - return s:source -endfunction "}}} - -let s:source = { - \ 'name': 'neosnippet/target', - \ 'hooks' : {}, - \ 'default_action' : 'select', - \ 'action_table' : {}, - \ 'is_listed' : 0, - \ } - -function! s:source.hooks.on_init(args, context) "{{{ - let a:context.source__bufnr = bufnr('%') - let a:context.source__linenr = line('.') - - let a:context.source__snippets = - \ sort(filter(values(neosnippet#helpers#get_snippets()), - \ "v:val.snip =~# neosnippet#get_placeholder_target_marker_pattern()")) -endfunction"}}} - -function! s:source.gather_candidates(args, context) "{{{ - 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, - \ }") -endfunction "}}} - -" Actions "{{{ -let s:source.action_table.select = { - \ 'description' : 'select targetted snippet', - \ } -function! s:source.action_table.select.func(candidate) "{{{ - let context = a:candidate.source__context - if bufnr('%') != context.source__bufnr || - \ line('.') != context.source__linenr - " Ignore. - return - endif - - call neosnippet#mappings#_expand_target_trigger( - \ a:candidate.source__trigger) -endfunction"}}} -"}}} - -function! unite#sources#neosnippet_target#start() "{{{ - if !exists(':Unite') - call neosnippet#util#print_error( - \ 'unite.vim is not installed.') - call neosnippet#util#print_error( - \ 'Please install unite.vim Ver.1.5 or above.') - return '' - elseif unite#version() < 300 - call neosnippet#util#print_error( - \ 'Your unite.vim is too old.') - call neosnippet#util#print_error( - \ 'Please install unite.vim Ver.3.0 or above.') - return '' - endif - - return unite#start_complete(['neosnippet/target'], - \ { 'buffer_name' : 'neosnippet/target' }) -endfunction "}}} - -function! s:get_keyword_pos(cur_text) "{{{ - let cur_keyword_pos = match(a:cur_text, '\S\+$') - if cur_keyword_pos < 0 - " Empty string. - return len(a:cur_text) - endif - - return cur_keyword_pos -endfunction"}}} - -let &cpo = s:save_cpo -unlet s:save_cpo - -" vim: foldmethod=marker diff --git a/doc/neosnippet.txt b/doc/neosnippet.txt index 082d374..5796ebc 100755 --- a/doc/neosnippet.txt +++ b/doc/neosnippet.txt @@ -281,12 +281,6 @@ i_(neosnippet_start_unite_snippet) x_(neosnippet_expand_target) Expand the input trigger by a selected target text. - *x_(neosnippet_start_unite_snippet_target)* -x_(neosnippet_start_unite_snippet_target) - Expand the input trigger by a selected target text with the - unite interface. - Note: The plug-in |unite.vim| is required for that feature. - *x_(neosnippet_register_oneshot_snippet)* x_(neosnippet_register_oneshot_snippet) Register oneshot snippet in the current buffer. @@ -333,7 +327,6 @@ EXAMPLES *neosnippet-examples* imap (neosnippet_expand_or_jump) smap (neosnippet_expand_or_jump) xmap (neosnippet_expand_target) - xmap (neosnippet_start_unite_snippet_target) " SuperTab like snippets' behavior. "imap neosnippet#expandable_or_jumpable() ? diff --git a/plugin/neosnippet.vim b/plugin/neosnippet.vim index 127a689..a6010e8 100644 --- a/plugin/neosnippet.vim +++ b/plugin/neosnippet.vim @@ -59,8 +59,6 @@ xnoremap (neosnippet_get_selected_text) xnoremap (neosnippet_expand_target) \ :call neosnippet#mappings#_expand_target() -xnoremap (neosnippet_start_unite_snippet_target) - \ unite#sources#neosnippet_target#start() xnoremap (neosnippet_register_oneshot_snippet) \ :call neosnippet#mappings#_register_oneshot_snippet()