Permalink
Browse files

added support for escaping backticks (issue#74)

  • Loading branch information...
1 parent 9fe9170 commit 26e93e91950b0978e4681786f397a6b23e7f3e00 msanders committed Dec 28, 2009
Showing with 8 additions and 6 deletions.
  1. +7 −5 autoload/snipMate.vim
  2. +1 −1 syntax/snippet.vim
View
@@ -75,15 +75,17 @@ endf
" Prepare snippet to be processed by s:BuildTabStops
fun s:ProcessSnippet(snip)
let snippet = a:snip
- " Evaluate eval (`...`) expressions.
+ " Evaluate eval (`...`) expressions.
+ " Backquotes prefixed with a backslash are ignored.
" Using a loop here instead of a regex fixes a bug with nested "\=".
if stridx(snippet, '`') != -1
- while match(snippet, '`.\{-}`') != -1
- let snippet = substitute(snippet, '`.\{-}`',
- \ substitute(eval(matchstr(snippet, '`\zs.\{-}\ze`')),
- \ "\n\\%$", '', ''), '')
+ while match(snippet, '[^\\]`.\{-}[^\\]`') != -1
+ let snippet = substitute(snippet, '[^\\]\zs`.\{-}[^\\]`\ze',
+ \ substitute(eval(matchstr(snippet, '[^\\]`\zs.\{-}[^\\]\ze`')),
+ \ "\n\\%$", '', ''), '')
endw
let snippet = substitute(snippet, "\r", "\n", 'g')
+ let snippet = substitute(snippet, '\\`', '`', 'g')
endif
" Place all text after a colon in a tab stop after the tab stop
View
@@ -3,7 +3,7 @@
syn match snipComment '^#.*'
syn match placeHolder '\${\d\+\(:.\{-}\)\=}' contains=snipCommand
syn match tabStop '\$\d\+'
-syn match snipCommand '`.\{-}`'
+syn match snipCommand '[^\\]`.\{-}`'
syn match snippet '^snippet.*' transparent contains=multiSnipText,snipKeyword
syn match multiSnipText '\S\+ \zs.*' contained
syn match snipKeyword '^snippet'me=s+8 contained

0 comments on commit 26e93e9

Please sign in to comment.