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

edge case: anon snip in pre-action

Browse Source
This commit is contained in:
Stanislav Seletskiy 2015-06-17 22:12:49 +06:00
parent 1e771de603
commit 5a663116f5
2 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pythonx/UltiSnips/snippet_manager.py
View File

@ -8,6 +8,7 @@ from functools import wraps
import os import os
import platform import platform
import traceback import traceback
from contextlib import contextmanager
from UltiSnips import _vim from UltiSnips import _vim
from UltiSnips._diff import diff, guess_edit from UltiSnips._diff import diff, guess_edit
@ -95,6 +96,9 @@ class SnippetManager(object):
self._snippet_sources = [] self._snippet_sources = []
self._snip_expanded_in_action = False
self._inside_action = False
self._added_snippets_source = AddedSnippetsSource() self._added_snippets_source = AddedSnippetsSource()
self.register_snippet_source('ultisnips_files', UltiSnipsFileSource()) self.register_snippet_source('ultisnips_files', UltiSnipsFileSource())
self.register_snippet_source('added', self._added_snippets_source) self.register_snippet_source('added', self._added_snippets_source)
@ -586,16 +590,19 @@ class SnippetManager(object):
done with it.""" done with it."""
self._setup_inner_state() self._setup_inner_state()
self._snip_expanded_in_action = False
# Adjust before, maybe the trigger is not the complete word # Adjust before, maybe the trigger is not the complete word
text_before = before text_before = before
if snippet.matched: if snippet.matched:
text_before = before[:-len(snippet.matched)] text_before = before[:-len(snippet.matched)]
with use_proxy_buffer(self._csnippets): with use_proxy_buffer(self._csnippets):
cursor_set_in_action = snippet.do_pre_expand( with self._action_context():
self._visual_content.text, cursor_set_in_action = snippet.do_pre_expand(
self._csnippets self._visual_content.text,
) self._csnippets
)
if cursor_set_in_action: if cursor_set_in_action:
text_before = _vim.buf.line_till_cursor text_before = _vim.buf.line_till_cursor
@ -637,13 +644,23 @@ class SnippetManager(object):
si.update_textobjects() si.update_textobjects()
with use_proxy_buffer(self._csnippets): with use_proxy_buffer(self._csnippets):
snippet.do_post_expand( with self._action_context():
si._start, si._end, self._csnippets snippet.do_post_expand(
) si._start, si._end, self._csnippets
)
self._vstate.remember_buffer(self._csnippets[0]) self._vstate.remember_buffer(self._csnippets[0])
self._jump() if not self._snip_expanded_in_action:
self._jump()
elif self._cs.current_text != '':
self._jump()
else:
self._current_snippet_is_done()
if self._inside_action:
self._snip_expanded_in_action = True
def _try_expand(self): def _try_expand(self):
"""Try to expand a snippet in the current place.""" """Try to expand a snippet in the current place."""
@ -733,3 +750,12 @@ class SnippetManager(object):
if not os.path.exists(dirname): if not os.path.exists(dirname):
os.makedirs(dirname) os.makedirs(dirname)
return file_to_edit return file_to_edit
@contextmanager
def _action_context(self):
try:
old_flag = self._inside_action
self._inside_action = True
yield
finally:
self._inside_action = old_flag

9
test/test_SnippetActions.py
View File

@ -307,3 +307,12 @@ class SnippetActions_CanEvenWrapSnippetInPreAction(_VimTest):
"""} """}
keys = "test" + EX + "1" + JF + "2" + JF + "3" + JF + "4" keys = "test" + EX + "1" + JF + "2" + JF + "3" + JF + "4"
wanted = """some_wrapper(wrapme(2, 1)3): 4""" wanted = """some_wrapper(wrapme(2, 1)3): 4"""
class SnippetActions_CanVisuallySelectFirstPlaceholderInAnonSnippetInPre(_VimTest):
files = { 'us/all.snippets': r"""
pre_expand "snip.buffer[snip.line] = ''; snip.expand_anon('${1:asd}, ${2:blah}')"
snippet test "test new features" wb
endsnippet
"""}
keys = "test" + EX + "1" + JF + "2"
wanted = """1, 2"""