From 2def1b4ce1b1e4ae21c996c53e0d1b95ba16ff0e Mon Sep 17 00:00:00 2001
From: Holger Rapp <SirVer@gmx.de>
Date: Fri, 1 Apr 2011 16:50:49 +0200
Subject: [PATCH] Escaping of \ didn't work

---
 plugin/UltiSnips/TextObjects.py | 14 +++++++-------
 test.py                         | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/plugin/UltiSnips/TextObjects.py b/plugin/UltiSnips/TextObjects.py
index a1b3faa..d7d2f1f 100644
--- a/plugin/UltiSnips/TextObjects.py
+++ b/plugin/UltiSnips/TextObjects.py
@@ -110,19 +110,19 @@ class _CleverReplace(object):
 
 class _TOParser(object):
     # A simple tabstop with default value
-    _TABSTOP = re.compile(r'''(?<!\\)\${(\d+)[:}]''')
+    _TABSTOP = re.compile(r'''(?<![^\\]\\)\${(\d+)[:}]''')
     # A mirror or a tabstop without default value.
-    _MIRROR_OR_TS = re.compile(r'(?<!\\)\$(\d+)')
+    _MIRROR_OR_TS = re.compile(r'(?<![^\\]\\)\$(\d+)')
     # A mirror or a tabstop without default value.
-    _TRANSFORMATION = re.compile(r'(?<!\\)\${(\d+)/(.*?)/(.*?)/([a-zA-z]*)}')
+    _TRANSFORMATION = re.compile(r'(?<![^\\]\\)\${(\d+)/(.*?)/(.*?)/([a-zA-z]*)}')
     # The beginning of a shell code fragment
-    _SHELLCODE = re.compile(r'(?<!\\)`')
+    _SHELLCODE = re.compile(r'(?<![^\\]\\)`')
     # The beginning of a python code fragment
-    _PYTHONCODE = re.compile(r'(?<!\\)`!p')
+    _PYTHONCODE = re.compile(r'(?<![^\\]\\)`!p')
     # The beginning of a vimL code fragment
-    _VIMCODE = re.compile(r'(?<!\\)`!v')
+    _VIMCODE = re.compile(r'(?<![^\\]\\)`!v')
     # Escaped characters in substrings
-    _UNESCAPE = re.compile(r'\\[`$]')
+    _UNESCAPE = re.compile(r'\\[`$\\]')
 
     def __init__(self, parent, val, indent):
         self._v = val
diff --git a/test.py b/test.py
index ea9d187..75ce9ea 100755
--- a/test.py
+++ b/test.py
@@ -427,6 +427,23 @@ class TabStop_EscapingCharsDollars(_VimTest):
     snippets = ("test", r"snip \$0 $$0 end")
     keys = "test" + EX + "hi"
     wanted = "snip $0 $hi end"
+class TabStop_EscapingChars_Backslash(_VimTest):
+    snippets = ("test", r"This \ is a backslash!")
+    keys = "test" + EX
+    wanted = "This \\ is a backslash!"
+class TabStop_EscapingChars_Backslash2(_VimTest):
+    snippets = ("test", r"This is a backslash \\ done")
+    keys = "test" + EX
+    wanted = r"This is a backslash \ done"
+class TabStop_EscapingChars_Backslash3(_VimTest):
+    snippets = ("test", r"These are two backslashes \\\\ done")
+    keys = "test" + EX
+    wanted = r"These are two backslashes \\ done"
+class TabStop_EscapingChars_Backslash4(_VimTest):
+    # Test for bug 746446
+    snippets = ("test", r"\\$1{$2}")
+    keys = "test" + EX + "hello" + JF + "world"
+    wanted = r"\hello{world}"
 class TabStop_EscapingChars_RealLife(_VimTest):
     snippets = ("test", r"usage: \`basename \$0\` ${1:args}")
     keys = "test" + EX + "[ -u -v -d ]"