gryf/snipmate.vim
1
0
Fork 0
mirror of https://github.com/gryf/snipmate.vim.git synced 2025-12-22 05:47:59 +01:00
Code Issues Projects Releases Wiki Activity

cleaned up code dealing with triggers for dotted file types

Browse Source
This commit is contained in:
Michael Sanders
2009-03-01 21:48:48 -05:00
parent a8109fa38f
commit b63e39d8ed
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugin/snipMate.vim
View File

@@ -8,7 +8,6 @@
" For more help see snipMate.txt; you can do this by using: " For more help see snipMate.txt; you can do this by using:
" :helptags ~/.vim/doc " :helptags ~/.vim/doc
" :h snipMate.txt " :h snipMate.txt
" Last Modified: February 28, 2009.
if exists('loaded_snips') || &cp || version < 700 if exists('loaded_snips') || &cp || version < 700
finish finish
@@ -114,14 +113,16 @@ fun! TriggerSnippet()
if exists('s:sid') | return "\<c-n>" | endif if exists('s:sid') | return "\<c-n>" | endif
call feedkeys("\<esc>a", 'n') | call s:UpdateChangedSnip(0) call feedkeys("\<esc>a", 'n') | call s:UpdateChangedSnip(0)
endif endif
if !exists('s:sid') && exists('g:SuperTabMappingForward') if !exists('s:sid') && exists('g:SuperTabMappingForward')
\ && g:SuperTabMappingForward == "<tab>" \ && g:SuperTabMappingForward == "<tab>"
call s:GetSuperTabSID() call s:GetSuperTabSID()
endif endif
for filetype in split(&ft, '\.') " deal with dotted file-types if exists('s:update') | return s:JumpTabStop() | endif
let word = s:GetSnippet(filetype)
let word = matchstr(getline('.'), '\S\+\%'.col('.').'c')
for filetype in split(&ft, '\.') + ['_'] " deal with dotted file-types
let trigger = s:GetSnippet(word, filetype)
if exists('s:snippet') | break | endif if exists('s:snippet') | break | endif
endfor endfor
@@ -130,8 +131,8 @@ fun! TriggerSnippet()
if s:snippet == '' " if user cancelled a multi snippet, quit if s:snippet == '' " if user cancelled a multi snippet, quit
return unl s:snippet return unl s:snippet
endif endif
let col = col('.')-len(word) let col = col('.')-len(trigger)
sil exe 's/'.escape(word, '.^$/\*[]').'\%#//' sil exe 's/'.escape(trigger, '.^$/\*[]').'\%#//'
return s:ExpandSnippet(col) return s:ExpandSnippet(col)
endif endif
if exists('s:snipPos') | return s:JumpTabStop() | endif if exists('s:snipPos') | return s:JumpTabStop() | endif
@@ -140,18 +141,14 @@ 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
" the text after non-word characters is (e.g. check for "foo" in "bar.foo") " the text after non-word characters is (e.g. check for "foo" in "bar.foo")
fun s:GetSnippet(ft) fun s:GetSnippet(word, ft)
let origWord = matchstr(getline('.'), '\S\+\%'.col('.').'c') let origWord = a:word
wh !exists('s:snippet') wh !exists('s:snippet')
let word = s:Hash(origWord) let word = s:Hash(origWord)
if exists('s:snippets["'.a:ft.'"]["'.word.'"]') if exists('s:snippets["'.a:ft.'"]["'.word.'"]')
let s:snippet = s:snippets[a:ft][word] let s:snippet = s:snippets[a:ft][word]
elseif exists('s:snippets["_"]["'.word.'"]')
let s:snippet = s:snippets['_'][word]
elseif exists('s:multi_snips["'.a:ft.'"]["'.word.'"]') elseif exists('s:multi_snips["'.a:ft.'"]["'.word.'"]')
let s:snippet = s:ChooseSnippet(a:ft, word) let s:snippet = s:ChooseSnippet(a:ft, word)
elseif exists('s:multi_snips["_"]["'.word.'"]')
let s:snippet = s:ChooseSnippet('_', word)
else else
if match(origWord, '\W') == -1 | break | endif if match(origWord, '\W') == -1 | break | endif
let origWord = substitute(origWord, '.\{-}\W', '', '') let origWord = substitute(origWord, '.\{-}\W', '', '')
@@ -222,7 +219,7 @@ fun s:ExpandSnippet(col)
" place cursor at end of snippet if no tab stop is given " place cursor at end of snippet if no tab stop is given
let newlines = len(snip)-1 let newlines = len(snip)-1
call cursor(lnum + newlines, indent + len(snip[-1]) - len(afterCursor) call cursor(lnum + newlines, indent + len(snip[-1]) - len(afterCursor)
\ + (newlines ? -1: col)) \ + (newlines ? 0: col-1))
endif endif
return '' return ''
endf endf