- Improved escape placeholder behavior.

This commit is contained in:
Shougo Matsushita 2013-04-02 17:51:12 +09:00
parent 08d5f030fd
commit 9e38cd7b9c
4 changed files with 21 additions and 8 deletions

View File

@ -1,7 +1,7 @@
"=============================================================================
" FILE: neosnippet.vim
" AUTHOR: Shougo Matsushita <Shougo.Matsu@gmail.com>
" Last Modified: 10 Mar 2013.
" Last Modified: 02 Apr 2013.
" License: MIT license {{{
" Permission is hereby granted, free of charge, to any person obtaining
" a copy of this software and associated documentation files (the
@ -557,11 +557,15 @@ function! neosnippet#expand(cur_text, col, trigger_name) "{{{
" Substitute markers.
let snip_word = substitute(snip_word,
\ s:get_placeholder_marker_substitute_pattern(),
\ '\\\@<!'.s:get_placeholder_marker_substitute_pattern(),
\ '<`\1`>', 'g')
let snip_word = substitute(snip_word,
\ s:get_mirror_placeholder_marker_substitute_pattern(),
\ '\\\@<!'.s:get_mirror_placeholder_marker_substitute_pattern(),
\ '<|\1|>', 'g')
let snip_word = substitute(snip_word,
\ '\\'.s:get_mirror_placeholder_marker_substitute_pattern().'\|'.
\ '\\'.s:get_placeholder_marker_substitute_pattern(),
\ '\=submatch(0)[1:]', 'g')
" Insert snippets.
let next_line = getline('.')[a:col-1 :]

View File

@ -115,7 +115,6 @@ options word
snippet main
options head
if __FILE__ == $ 0
if __FILE__ == \$0
${1:TARGET}
end
# the space is necessary unfortunately..

View File

@ -555,6 +555,13 @@ special meaning to neosnippet you need to escape them with a backslash.
snippet test
${1:escape \} value}
# Substitute "\$0" to "$0"
snippet main
options head
if __FILE__ == \$0
${1:TARGET}
end
<
A placeholder value can not contain new lines. The snippet below isn't valid.
@ -756,6 +763,9 @@ A:
==============================================================================
CHANGELOG *neosnippet-changelog*
2013-04-02
- Improved escape placeholder behavior.
2013-03-30
- Added rst snippets.
- Added g:neosnippet#enable_preview option.

View File

@ -38,9 +38,9 @@ syn region neosnippetString start=+"+ end=+"+ contained
syn region neosnippetEval start=+\\\@<!`+ end=+\\\@<!`+ contained
syn match neosnippetWord '^\s\+.*$' contains=
\neosnippetEval,neosnippetPlaceHolder,neosnippetEscape,neosnippetVariable
syn match neosnippetPlaceHolder '\${\d\+\%(:.\{-}\)\?\\\@<!}'
syn match neosnippetPlaceHolder '\\\@<!\${\d\+\%(:.\{-}\)\?\\\@<!}'
\ contained contains=neosnippetPlaceHolderComment
syn match neosnippetVariable '\$\d\+' contained
syn match neosnippetVariable '\\\@<!\$\d\+' contained
syn match neosnippetComment '^#.*$'
syn match neosnippetEscape '\\[`]' contained