vim/UltiSnips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Holger Rapp 2012-02-24 09:42:02 +01:00
parent 773d143a96
commit 45b1d09d53
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugin/UltiSnips/text_objects/_lexer.py
View File

@ -54,6 +54,19 @@ class _TextIterator(object):
@property @property
def pos(self): def pos(self):
return Position(self._line, self._col) 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 }}} # End: Helper Classes }}}
# Helper functions {{{ # Helper functions {{{
def _parse_number(stream): def _parse_number(stream):
@ -152,11 +165,15 @@ class VisualToken(Token):
if stream.peek() == ":": if stream.peek() == ":":
stream.next() stream.next()
self.alternative_text, c = _parse_till_unescaped_char(stream, '/}') self.alternative_text, c = _parse_till_unescaped_char(stream, '/}')
self.alternative_text = unescape(self.alternative_text)
if c == '/': # Transformation going on if c == '/': # Transformation going on
self.search = _parse_till_unescaped_char(stream, '/')[0] try:
self.replace = _parse_till_unescaped_char(stream, '/')[0] self.search = _parse_till_unescaped_char(stream, '/')[0]
self.options = _parse_till_closing_brace(stream) 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: else:
self.search = None self.search = None
self.replace = None self.replace = None

4
test.py
View File

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