From 4b24e4bc2f2e3d14a853770af83eb144dc2bdeb5 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Wed, 14 Mar 2012 09:43:33 +0900
Subject: [PATCH] - Changed marker patterns.

---
 .../sources/snippets_complete.vim             | 22 +++++++++++++------
 doc/neocomplcache-snippets-complete.txt       |  1 +
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/autoload/neocomplcache/sources/snippets_complete.vim b/autoload/neocomplcache/sources/snippets_complete.vim
index 386e086..d8cf1c5 100644
--- a/autoload/neocomplcache/sources/snippets_complete.vim
+++ b/autoload/neocomplcache/sources/snippets_complete.vim
@@ -548,6 +548,14 @@ function! neocomplcache#sources#snippets_complete#expand(cur_text, col, trigger_
   " Substitute escaped `.
   let snip_word = substitute(snip_word, '\\`', '`', 'g')
 
+  " Substitute markers.
+  let snip_word = substitute(snip_word,
+        \ s:get_placeholder_marker_substitute_pattern(),
+        \ '<`\1`>', 'g')
+  let snip_word = substitute(snip_word,
+        \ s:get_mirror_placeholder_marker_substitute_pattern(),
+        \ '<|\1|>', 'g')
+
   " Insert snippets.
   let next_line = getline('.')[a:col-1 :]
   let snippet_lines = split(snip_word, '\n', 1)
@@ -820,25 +828,25 @@ function! neocomplcache#sources#snippets_complete#get_snippets()"{{{
 endfunction"}}}
 
 function! s:get_placeholder_marker_pattern()"{{{
-  return '\${\d\+\%(:.\{-}\)\?\\\@<!}'
+  return '<`\d\+\%(:.\{-}\)\?\\\@<!`>'
 endfunction"}}}
 function! s:get_placeholder_marker_substitute_pattern()"{{{
-  return '\${\zs\d\+\%(:.\{-}\)\?\\\@<!\ze}'
+  return '\${\(\d\+\%(:.\{-}\)\?\\\@<!\)}'
 endfunction"}}}
 function! s:get_placeholder_marker_default_pattern()"{{{
-  return '\${\d\+:\zs.\{-}\ze\\\@<!}'
+  return '<`\d\+:\zs.\{-}\ze\\\@<!`>'
 endfunction"}}}
 function! s:get_sync_placeholder_marker_pattern()"{{{
-  return '\$<\d\+\%(:.\{-}\)\?\\\@<!>'
+  return '<{\d\+\%(:.\{-}\)\?\\\@<!}>'
 endfunction"}}}
 function! s:get_sync_placeholder_marker_default_pattern()"{{{
-  return '\$<\d\+:\zs.\{-}\ze\\\@<!>'
+  return '<{\d\+:\zs.\{-}\ze\\\@<!}>'
 endfunction"}}}
 function! s:get_mirror_placeholder_marker_pattern()"{{{
-  return '\$\d\+'
+  return '<|\d\+|>'
 endfunction"}}}
 function! s:get_mirror_placeholder_marker_substitute_pattern()"{{{
-  return '\$\zs\d\+\ze'
+  return '\$\(\d\+\)'
 endfunction"}}}
 function! s:SID_PREFIX()"{{{
   return matchstr(expand('<sfile>'), '<SNR>\d\+_')
diff --git a/doc/neocomplcache-snippets-complete.txt b/doc/neocomplcache-snippets-complete.txt
index 1bd6491..09b9016 100644
--- a/doc/neocomplcache-snippets-complete.txt
+++ b/doc/neocomplcache-snippets-complete.txt
@@ -299,6 +299,7 @@ CHANGELOG					*neocomplcache-snippets-complete-changelog*
 - Refactored expand snippet behavior.
 - Fixed expand bug.
 - Refactored substitute patterns.
+- Changed marker patterns.
 
 2012-03-08
 - Use shiftwidth instead of softabstop.