Fixed bug: / could not be escaped in Visual default text

plugin/UltiSnips/text_objects/_lexer.py

@@ -54,6 +54,19 @@ class _TextIterator(object):
     @property
     def pos(self):
         return Position(self._line, self._col)
+
+def unescape(s):
+    rv = ""
+    i = 0
+    while i < len(s):
+        if i+1 < len(s) and s[i] == '\\':
+            rv += s[i+1]
+            i += 1
+        else:
+            rv += s[i]
+        i += 1
+    return rv
+
 # End: Helper Classes  }}}
 # Helper functions  {{{
 def _parse_number(stream):
@@ -152,11 +165,15 @@ class VisualToken(Token):
         if stream.peek() == ":":
             stream.next()
         self.alternative_text, c = _parse_till_unescaped_char(stream, '/}')
+        self.alternative_text = unescape(self.alternative_text)
 
         if c == '/': # Transformation going on
-            self.search = _parse_till_unescaped_char(stream, '/')[0]
-            self.replace = _parse_till_unescaped_char(stream, '/')[0]
-            self.options = _parse_till_closing_brace(stream)
+            try:
+                self.search = _parse_till_unescaped_char(stream, '/')[0]
+                self.replace = _parse_till_unescaped_char(stream, '/')[0]
+                self.options = _parse_till_closing_brace(stream)
+            except StopIteration:
+                raise RuntimeError("Invalid ${VISUAL} transformation! Forgot to escape a '/'?")
         else:
             self.search = None
             self.replace = None

test.py

@@ -1539,6 +1539,10 @@ class VisualWithDefault_ExpandWithoutVisual(_VimTest):
     snippets = ("test", "h${VISUAL:world}b")
     keys = "test" + EX + "hi"
     wanted = "hworldbhi"
+class VisualWithDefaultWithSlashes_ExpandWithoutVisual(_VimTest):
+    snippets = ("test", r"h${VISUAL:\/\/ body}b")
+    keys = "test" + EX + "hi"
+    wanted = "h// bodybhi"
 class VisualWithDefault_ExpandWithVisual(_VimTest):
     snippets = ("test", "h${VISUAL:world}b")
     keys = "blablub" + ESC + "0v6l" + EX + "test" + EX