hasufell/neosnippet.vim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Fixed expand target behavior.

Browse Source
This commit is contained in:
Shougo Matsushita
2012-12-13 16:52:58 +09:00
parent d01cd7247f
commit 0fa62bcea1
4 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
autoload/unite/sources/snippet.vim
View File

@@ -1,7 +1,7 @@
"=============================================================================
" FILE: snippet.vim
" AUTHOR: Shougo Matsushita <Shougo.Matsu@gmail.com>
" Last Modified: 02 Nov 2012.
" Last Modified: 13 Dec 2012.
" License: MIT license {{{
" Permission is hereby granted, free of charge, to any person obtaining
" a copy of this software and associated documentation files (the
@@ -64,7 +64,8 @@ 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),
\ 'word' : keyword.word,
\ 'abbr' : printf('%-50s %s', keyword.word, keyword.menu),
\ 'kind': 'snippet',
\ 'action__complete_word' : keyword.word,
\ 'action__complete_pos' : keyword_pos,
@@ -167,8 +168,7 @@ function! unite#sources#snippet#start_complete() "{{{
endif
return unite#start_complete(['snippet'],
\ { 'input': neosnippet#util#get_cur_text(),
\ 'buffer_name' : 'snippet' })
\ { 'input': neosnippet#util#get_cur_text(), 'buffer_name' : '' })
endfunction "}}}
function! s:get_keyword_pos(cur_text)"{{{

21
autoload/unite/sources/snippet_target.vim
View File

@@ -1,7 +1,7 @@
"=============================================================================
" FILE: snippet_target.vim
" AUTHOR: Shougo Matsushita <Shougo.Matsu@gmail.com>
" Last Modified: 06 Nov 2012.
" Last Modified: 13 Dec 2012.
" License: MIT license {{{
" Permission is hereby granted, free of charge, to any person obtaining
" a copy of this software and associated documentation files (the
@@ -82,24 +82,7 @@ function! s:source.action_table.select.func(candidate)"{{{
return
endif
let neosnippet = neosnippet#get_current_neosnippet()
let neosnippet.target = substitute(
\ neosnippet#get_selected_text(visualmode(), 1), '\n$', '', '')
let base_indent = matchstr(neosnippet.target, '^\s*')
" Delete base_indent.
let neosnippet.target = substitute(neosnippet.target,
\'^' . base_indent, '', 'g')
call neosnippet#substitute_selected_text(visualmode(),
\ base_indent)
call cursor(0, getpos("'<")[2])
let col = col('.') < len(base_indent)+1 ? len(base_indent)+1 : col('.')
call neosnippet#expand(neosnippet#util#get_cur_text(),
\ col, a:candidate.source__trigger)
call neosnippet#expand_target_trigger(a:candidate.source__trigger)
endfunction"}}}
"}}}