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

fix #616: update state on edit w/o cursor move

Browse Source 
UltiSnips tracks changes in buffer and apply user changes only on
CursorMoved event. So, if placeholder is replaced completely by using
<BS>, CursorMoved is not triggered and internal snippet representation
is not updated, causing placeholder boundaries go out-of-sync.

Fixed by triggering text objects sync forcefully if change without
cursor move is detected.
This commit is contained in:
Stanislav Seletskiy 2015-12-08 13:40:31 +06:00
parent 1b481f312e
commit 45e3775c18
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pythonx/UltiSnips/snippet_manager.py
View File

@ -136,6 +136,8 @@ class SnippetManager(object):
self.register_snippet_source('snipmate_files', self.register_snippet_source('snipmate_files',
SnipMateFileSource()) SnipMateFileSource())
self._should_update_textobjects = False
self._reinit() self._reinit()
@err_to_scratch_buffer @err_to_scratch_buffer
@ -303,6 +305,8 @@ class SnippetManager(object):
@err_to_scratch_buffer @err_to_scratch_buffer
def _cursor_moved(self): def _cursor_moved(self):
"""Called whenever the cursor moved.""" """Called whenever the cursor moved."""
self._should_update_textobjects = False
if not self._csnippets and self._inner_state_up: if not self._csnippets and self._inner_state_up:
self._teardown_inner_state() self._teardown_inner_state()
self._vstate.remember_position() self._vstate.remember_position()
@ -469,11 +473,14 @@ class SnippetManager(object):
self._teardown_inner_state() self._teardown_inner_state()
def _jump(self, backwards=False): def _jump(self, backwards=False):
"""Helper method that does the actual jump."""
if self._should_update_textobjects:
self._cursor_moved()
# we need to set 'onemore' there, because of limitations of the vim # we need to set 'onemore' there, because of limitations of the vim
# API regarding cursor movements; without that test # API regarding cursor movements; without that test
# 'CanExpandAnonSnippetInJumpActionWhileSelected' will fail # 'CanExpandAnonSnippetInJumpActionWhileSelected' will fail
with _vim.toggle_opt('ve', 'onemore'): with _vim.toggle_opt('ve', 'onemore'):
"""Helper method that does the actual jump."""
jumped = False jumped = False
# We need to remember current snippets stack here because of # We need to remember current snippets stack here because of
@ -632,6 +639,7 @@ class SnippetManager(object):
self._setup_inner_state() self._setup_inner_state()
self._snip_expanded_in_action = False self._snip_expanded_in_action = False
self._should_update_textobjects = 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
@ -802,6 +810,8 @@ class SnippetManager(object):
@err_to_scratch_buffer @err_to_scratch_buffer
def _track_change(self): def _track_change(self):
self._should_update_textobjects = True
inserted_char = _vim.eval('v:char') inserted_char = _vim.eval('v:char')
try: try:
if inserted_char == '': if inserted_char == '':

18
test/test_Editing.py
View File

@ -120,3 +120,21 @@ class Backspace_TabStop_NotZero(_VimTest):
keys = 'test' + EX + 'A' + JF + BS + 'BBB' keys = 'test' + EX + 'A' + JF + BS + 'BBB'
wanted = 'AA BBB' wanted = 'AA BBB'
# End: Pressing BS in TabStop #}}} # End: Pressing BS in TabStop #}}}
class UpdateModifiedSnippetWithoutCursorMove(_VimTest):
snippets = ('test', '${1:one}(${2:xxx})${3:three}')
keys = 'test' + EX + 'aaaaa' + JF + BS + JF + '3333'
wanted = 'aaaaa()3333'
class UpdateModifiedSnippetWithoutCursorMove2(_VimTest):
snippets = ('test', '''\
private function ${1:functionName}(${2:arguments}):${3:Void}
{
${VISUAL}$0
}''')
keys = 'test' + EX + 'a' + JF + BS + JF + 'Int' + JF + 'body'
wanted = '''\
private function a():Int
{
body
}'''