gryf/snipmate.vim
1
0
Fork 0
mirror of https://github.com/gryf/snipmate.vim.git synced 2026-01-30 12:16:06 +01:00
Code Issues Projects Releases Wiki Activity

fixed another bug with supertab

Browse Source
This commit is contained in:
Michael Sanders
2009-03-29 11:44:56 -04:00
parent 90077ef529
commit 0e850ccc1c
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/snipMate.vim
View File

@@ -1,6 +1,6 @@
" File: snipMate.vim " File: snipMate.vim
" Author: Michael Sanders " Author: Michael Sanders
" Version: 0.75 " Version: 0.76
" Description: snipMate.vim implements some of TextMate's snippets features in " Description: snipMate.vim implements some of TextMate's snippets features in
" Vim. A snippet is a piece of often-typed text that you can " Vim. A snippet is a piece of often-typed text that you can
" insert into your document using a trigger word followed by a "<tab>". " insert into your document using a trigger word followed by a "<tab>".
@@ -119,15 +119,15 @@ endf
fun! TriggerSnippet() fun! TriggerSnippet()
if exists('g:SuperTabMappingForward') if exists('g:SuperTabMappingForward')
if g:SuperTabMappingForward == "<tab>" if g:SuperTabMappingForward == "<tab>"
let g:SuperTabKey = "\<c-n>" let SuperTabKey = "\<c-n>"
elseif g:SuperTabMappingBackward == "<tab>" elseif g:SuperTabMappingBackward == "<tab>"
let g:SuperTabKey = "\<c-p>" let SuperTabKey = "\<c-p>"
endif endif
endif endif
if pumvisible() " Update snippet if completion is used, or deal with supertab if pumvisible() " Update snippet if completion is used, or deal with supertab
if exists('g:SuperTabKey') if exists('SuperTabKey')
call feedkeys(g:SuperTabKey) | return '' call feedkeys(SuperTabKey) | return ''
endif endif
call feedkeys("\<esc>a", 'n') " Close completion menu call feedkeys("\<esc>a", 'n') " Close completion menu
call feedkeys("\<tab>") | return '' call feedkeys("\<tab>") | return ''
@@ -149,9 +149,11 @@ fun! TriggerSnippet()
let col = col('.') - len(trigger) let col = col('.') - len(trigger)
sil exe 's/'.escape(trigger, '.^$/\*[]').'\%#//' sil exe 's/'.escape(trigger, '.^$/\*[]').'\%#//'
return snipMate#expandSnip(col) return snipMate#expandSnip(col)
elseif exists('SuperTabKey')
call feedkeys(SuperTabKey)
return ''
endif endif
return exists('g:SuperTabKey') && getline('.')[col('.')-2] =~ '\S' return "\<tab>"
\ ? g:SuperTabKey : "\<tab>"
endf endf
" Check if word under cursor is snippet trigger; if it isn't, try checking if " Check if word under cursor is snippet trigger; if it isn't, try checking if