aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasuhiro Matsumoto <mattn.jp@gmail.com>2019-03-01 18:28:20 +0900
committerYasuhiro Matsumoto <mattn.jp@gmail.com>2019-03-01 18:28:20 +0900
commitffd98639c3a2444d84585397e42a985371a90358 (patch)
treeb46ceaeea955fd3223ee4bd4ebf8f3a540c1a2aa
parent70f5ab9ca0fb359f8b11a84a464e52120d992bd4 (diff)
parente5848c2375d2b470685d39bfdb9c0227e39411bf (diff)
downloadvim-sonictemplate-ffd98639c3a2444d84585397e42a985371a90358.tar.gz
vim-sonictemplate-ffd98639c3a2444d84585397e42a985371a90358.tar.bz2
vim-sonictemplate-ffd98639c3a2444d84585397e42a985371a90358.zip
Merge branch 'master' of https://github.com/mattn/sonictemplate-vim
-rw-r--r--autoload/sonictemplate.vim14
1 files changed, 12 insertions, 2 deletions
diff --git a/autoload/sonictemplate.vim b/autoload/sonictemplate.vim
index cbadd45..2c68664 100644
--- a/autoload/sonictemplate.vim
+++ b/autoload/sonictemplate.vim
@@ -1,7 +1,7 @@
"=============================================================================
" sonictemplate.vim
" Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
-" Last Change: 03-Sep-2013.
+" Last Change: 25-Feb-2019.
let s:save_cpo = &cpo
set cpo&vim
@@ -55,7 +55,17 @@ endfunction
function! s:get_candidate(fts, lead)
let fts = a:fts
let filter = ''
- let prefix = search('[^ \t]', 'wn') ? 'snip' : 'base'
+ if getcmdwintype() ==# ''
+ let prefix = search('[^ \t]', 'wn') ? 'snip' : 'base'
+ else
+ let prefix = 'base'
+ for line in getbufline(bufnr('#'), 1, '$')
+ if match(line, '[^ \t]') != -1
+ let prefix = 'snip'
+ break
+ endif
+ endfor
+ endif
try
let ft = s:get_filetype()
let cxt = sonictemplate#lang#{ft!=""?ft:"_"}#guess()