From 601f62b6205ad4c35ea41ca19c5e0bfd4fea5e3c Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Tue, 3 Nov 2015 15:06:23 +0900
Subject: [PATCH] Fix #297 add neosnippet#expand()

---
 autoload/neosnippet.vim          |  3 +++
 autoload/neosnippet/mappings.vim | 24 +++++++++++++++++-------
 doc/neosnippet.txt               | 10 +++++++++-
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/autoload/neosnippet.vim b/autoload/neosnippet.vim
index 9559a7f..f544e19 100644
--- a/autoload/neosnippet.vim
+++ b/autoload/neosnippet.vim
@@ -55,6 +55,9 @@ endfunction"}}}
 function! neosnippet#anonymous(snippet, ...) "{{{
   return neosnippet#mappings#_anonymous(a:snippet, get(a:000, 0, {}))
 endfunction"}}}
+function! neosnippet#expand(trigger) "{{{
+  return neosnippet#mappings#_expand(a:trigger)
+endfunction"}}}
 
 function! neosnippet#get_snippets_directory() "{{{
   return neosnippet#helpers#get_snippets_directory()
diff --git a/autoload/neosnippet/mappings.vim b/autoload/neosnippet/mappings.vim
index 6d8daae..316eb81 100644
--- a/autoload/neosnippet/mappings.vim
+++ b/autoload/neosnippet/mappings.vim
@@ -144,14 +144,24 @@ function! neosnippet#mappings#_anonymous(snippet, options) "{{{
   call neosnippet#view#_insert(a:snippet, options, cur_text, col('.'))
   return ''
 endfunction"}}}
+function! neosnippet#mappings#_expand(trigger) "{{{
+  let col = col('.')
+  if mode() !=# 'i'
+    " Fix column.
+    let col += 2
+  endif
+
+  call neosnippet#view#_expand(
+        \ neosnippet#util#get_cur_text(), col, a:trigger)
+  return ''
+endfunction"}}}
 
 function! s:snippets_expand(cur_text, col) "{{{
   let cur_word = neosnippet#helpers#get_cursor_snippet(
         \ neosnippet#helpers#get_snippets(),
         \ a:cur_text)
 
-  call neosnippet#view#_expand(
-        \ a:cur_text, a:col, cur_word)
+  call neosnippet#view#_expand(a:cur_text, a:col, cur_word)
 endfunction"}}}
 
 function! s:snippets_expand_or_jump(cur_text, col) "{{{
@@ -184,7 +194,7 @@ function! s:SID_PREFIX() "{{{
   return matchstr(expand('<sfile>'), '<SNR>\d\+_\ze\w\+$')
 endfunction"}}}
 
-function! s:trigger(function) "{{{
+function! neosnippet#mappings#_trigger(function) "{{{
   call neosnippet#init#check()
 
   let cur_text = neosnippet#util#get_cur_text()
@@ -211,16 +221,16 @@ endfunction"}}}
 
 " Plugin key-mappings.
 function! neosnippet#mappings#expand_or_jump_impl()
-  return s:trigger(s:SID_PREFIX().'snippets_expand_or_jump')
+  return neosnippet#mappings#_trigger(s:SID_PREFIX().'snippets_expand_or_jump')
 endfunction
 function! neosnippet#mappings#jump_or_expand_impl()
-  return s:trigger(s:SID_PREFIX().'snippets_jump_or_expand')
+  return neosnippet#mappings#_trigger(s:SID_PREFIX().'snippets_jump_or_expand')
 endfunction
 function! neosnippet#mappings#expand_impl()
-  return s:trigger(s:SID_PREFIX().'snippets_expand')
+  return neosnippet#mappings#_trigger(s:SID_PREFIX().'snippets_expand')
 endfunction
 function! neosnippet#mappings#jump_impl()
-  return s:trigger('neosnippet#view#_jump')
+  return neosnippet#mappings#_trigger('neosnippet#view#_jump')
 endfunction
 
 let &cpo = s:save_cpo
diff --git a/doc/neosnippet.txt b/doc/neosnippet.txt
index b5ac0ae..7cd4632 100755
--- a/doc/neosnippet.txt
+++ b/doc/neosnippet.txt
@@ -319,7 +319,7 @@ neosnippet#expandable_or_jumpable()
 		\ neosnippet#expandable_or_jumpable() ?
 		\ "\<Plug>(neosnippet_expand_or_jump)" : "\<C-n>"
 <
-					*neosnippet#anonymous()*
+						*neosnippet#anonymous()*
 neosnippet#anonymous({snippet}, [{options}])
 		It defines anonymous snippet.
 		{snippet} is snippet definition.
@@ -332,6 +332,14 @@ neosnippet#anonymous({snippet}, [{options}])
 		inoremap <silent> ((
 		\ <C-r>=neosnippet#anonymous('\left(${1}\right)${0}')<CR>
 <
+						*neosnippet#expand()*
+neosnippet#expand({trigger})
+		It expands the snippet trigger.
+		{trigger} is snippet trigger. >
+
+		nnoremap <silent> test
+		\ i<C-r>=neosnippet#expand('date_english')<CR>
+
 ------------------------------------------------------------------------------
 FUNCTIONS					*neosnippet-functions*