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

Rename some variables for added clarity. (#977)

Browse Source
This commit is contained in:
Holger Rapp 2018-04-16 11:20:37 +02:00 committed by UltiBot
parent 21ea2f4efc
commit 905e524924
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
pythonx/UltiSnips/snippet_manager.py
View File

@ -70,7 +70,7 @@ class SnippetManager(object):
self._inner_state_up = False self._inner_state_up = False
self._supertab_keys = None self._supertab_keys = None
self._csnippets = [] self._active_snippets = []
self._added_buffer_filetypes = defaultdict(lambda: []) self._added_buffer_filetypes = defaultdict(lambda: [])
self._vstate = VimState() self._vstate = VimState()
@ -285,9 +285,9 @@ class SnippetManager(object):
self._ignore_movements = False self._ignore_movements = False
return return
if self._csnippets: if self._active_snippets:
cstart = self._csnippets[0].start.line cstart = self._active_snippets[0].start.line
cend = self._csnippets[0].end.line + \ cend = self._active_snippets[0].end.line + \
self._vstate.diff_in_buffer_length self._vstate.diff_in_buffer_length
ct = _vim.buf[cstart:cend + 1] ct = _vim.buf[cstart:cend + 1]
lt = self._vstate.remembered_buffer lt = self._vstate.remembered_buffer
@ -328,16 +328,16 @@ class SnippetManager(object):
lt = '\n'.join(lt) lt = '\n'.join(lt)
ct = '\n'.join(ct) ct = '\n'.join(ct)
es = diff(lt, ct, initial_line) es = diff(lt, ct, initial_line)
self._csnippets[0].replay_user_edits(es, self._ctab) self._active_snippets[0].replay_user_edits(es, self._ctab)
except IndexError: except IndexError:
# Rather do nothing than throwing an error. It will be correct # Rather do nothing than throwing an error. It will be correct
# most of the time # most of the time
pass pass
self._check_if_still_inside_snippet() self._check_if_still_inside_snippet()
if self._csnippets: if self._active_snippets:
self._csnippets[0].update_textobjects(_vim.buf) self._active_snippets[0].update_textobjects(_vim.buf)
self._vstate.remember_buffer(self._csnippets[0]) self._vstate.remember_buffer(self._active_snippets[0])
def _setup_inner_state(self): def _setup_inner_state(self):
"""Map keys and create autocommands that should only be defined when a """Map keys and create autocommands that should only be defined when a
@ -415,7 +415,7 @@ class SnippetManager(object):
terminated. terminated.
""" """
while len(self._csnippets): while len(self._active_snippets):
self._current_snippet_is_done() self._current_snippet_is_done()
self._reinit() self._reinit()
@ -426,8 +426,8 @@ class SnippetManager(object):
def _check_if_still_inside_snippet(self): def _check_if_still_inside_snippet(self):
"""Checks if the cursor is outside of the current snippet.""" """Checks if the cursor is outside of the current snippet."""
if self._cs and ( if self._current_snippet and (
not self._cs.start <= _vim.buf.cursor <= self._cs.end not self._current_snippet.start <= _vim.buf.cursor <= self._current_snippet.end
): ):
self._current_snippet_is_done() self._current_snippet_is_done()
self._reinit() self._reinit()
@ -435,8 +435,8 @@ class SnippetManager(object):
def _current_snippet_is_done(self): def _current_snippet_is_done(self):
"""The current snippet should be terminated.""" """The current snippet should be terminated."""
self._csnippets.pop() self._active_snippets.pop()
if not self._csnippets: if not self._active_snippets:
self._teardown_inner_state() self._teardown_inner_state()
def _jump(self, backwards=False): def _jump(self, backwards=False):
@ -454,24 +454,24 @@ class SnippetManager(object):
# We need to remember current snippets stack here because of # We need to remember current snippets stack here because of
# post-jump action on the last tabstop should be able to access # post-jump action on the last tabstop should be able to access
# snippet instance which is ended just now. # snippet instance which is ended just now.
stack_for_post_jump = self._csnippets[:] stack_for_post_jump = self._active_snippets[:]
# If next tab has length 1 and the distance between itself and # If next tab has length 1 and the distance between itself and
# self._ctab is 1 then there is 1 less CursorMove events. We # self._ctab is 1 then there is 1 less CursorMove events. We
# cannot ignore next movement in such case. # cannot ignore next movement in such case.
ntab_short_and_near = False ntab_short_and_near = False
if self._cs: if self._current_snippet:
snippet_for_action = self._cs snippet_for_action = self._current_snippet
elif stack_for_post_jump: elif stack_for_post_jump:
snippet_for_action = stack_for_post_jump[-1] snippet_for_action = stack_for_post_jump[-1]
else: else:
snippet_for_action = None snippet_for_action = None
if self._cs: if self._current_snippet:
ntab = self._cs.select_next_tab(backwards) ntab = self._current_snippet.select_next_tab(backwards)
if ntab: if ntab:
if self._cs.snippet.has_option('s'): if self._current_snippet.snippet.has_option('s'):
lineno = _vim.buf.cursor.line lineno = _vim.buf.cursor.line
_vim.buf[lineno] = _vim.buf[lineno].rstrip() _vim.buf[lineno] = _vim.buf[lineno].rstrip()
_vim.select(ntab.start, ntab.end) _vim.select(ntab.start, ntab.end)
@ -486,15 +486,15 @@ class SnippetManager(object):
# Run interpolations again to update new placeholder # Run interpolations again to update new placeholder
# values, binded to currently newly jumped placeholder. # values, binded to currently newly jumped placeholder.
self._visual_content.conserve_placeholder(self._ctab) self._visual_content.conserve_placeholder(self._ctab)
self._cs.current_placeholder = \ self._current_snippet.current_placeholder = \
self._visual_content.placeholder self._visual_content.placeholder
self._should_reset_visual = False self._should_reset_visual = False
self._csnippets[0].update_textobjects(_vim.buf) self._active_snippets[0].update_textobjects(_vim.buf)
# Open any folds this might have created # Open any folds this might have created
_vim.command('normal! zv') _vim.command('normal! zv')
self._vstate.remember_buffer(self._csnippets[0]) self._vstate.remember_buffer(self._active_snippets[0])
if ntab.number == 0 and self._csnippets: if ntab.number == 0 and self._active_snippets:
self._current_snippet_is_done() self._current_snippet_is_done()
else: else:
# This really shouldn't happen, because a snippet should # This really shouldn't happen, because a snippet should
@ -630,11 +630,11 @@ class SnippetManager(object):
if snippet.matched: if snippet.matched:
text_before = before[:-len(snippet.matched)] text_before = before[:-len(snippet.matched)]
with use_proxy_buffer(self._csnippets, self._vstate): with use_proxy_buffer(self._active_snippets, self._vstate):
with self._action_context(): with self._action_context():
cursor_set_in_action = snippet.do_pre_expand( cursor_set_in_action = snippet.do_pre_expand(
self._visual_content.text, self._visual_content.text,
self._csnippets self._active_snippets
) )
if cursor_set_in_action: if cursor_set_in_action:
@ -645,7 +645,7 @@ class SnippetManager(object):
start = Position(_vim.buf.cursor.line, len(text_before)) start = Position(_vim.buf.cursor.line, len(text_before))
end = Position(_vim.buf.cursor.line, len(before)) end = Position(_vim.buf.cursor.line, len(before))
parent = None parent = None
if self._cs: if self._current_snippet:
# If cursor is set in pre-action, then action was modified # If cursor is set in pre-action, then action was modified
# cursor line, in that case we do not need to do any edits, it # cursor line, in that case we do not need to do any edits, it
# can break snippet # can break snippet
@ -659,27 +659,27 @@ class SnippetManager(object):
('D', start.line, start.col, snippet.matched), ('D', start.line, start.col, snippet.matched),
('I', start.line, start.col, snippet.matched), ('I', start.line, start.col, snippet.matched),
] ]
self._csnippets[0].replay_user_edits(edit_actions) self._active_snippets[0].replay_user_edits(edit_actions)
parent = self._cs.find_parent_for_new_to(start) parent = self._current_snippet.find_parent_for_new_to(start)
snippet_instance = snippet.launch(text_before, snippet_instance = snippet.launch(text_before,
self._visual_content, parent, start, end) self._visual_content, parent, start, end)
# Open any folds this might have created # Open any folds this might have created
_vim.command('normal! zv') _vim.command('normal! zv')
self._visual_content.reset() self._visual_content.reset()
self._csnippets.append(snippet_instance) self._active_snippets.append(snippet_instance)
with use_proxy_buffer(self._csnippets, self._vstate): with use_proxy_buffer(self._active_snippets, self._vstate):
with self._action_context(): with self._action_context():
snippet.do_post_expand( snippet.do_post_expand(
snippet_instance._start, snippet_instance._end, self._csnippets snippet_instance._start, snippet_instance._end, self._active_snippets
) )
self._vstate.remember_buffer(self._csnippets[0]) self._vstate.remember_buffer(self._active_snippets[0])
if not self._snip_expanded_in_action: if not self._snip_expanded_in_action:
self._jump() self._jump()
elif self._cs.current_text != '': elif self._current_snippet.current_text != '':
self._jump() self._jump()
else: else:
self._current_snippet_is_done() self._current_snippet_is_done()
@ -712,11 +712,11 @@ class SnippetManager(object):
return True return True
@property @property
def _cs(self): def _current_snippet(self):
"""The current snippet or None.""" """The current snippet or None."""
if not len(self._csnippets): if not len(self._active_snippets):
return None return None
return self._csnippets[-1] return self._active_snippets[-1]
def _file_to_edit(self, requested_ft, bang): def _file_to_edit(self, requested_ft, bang):
"""Returns a file to be edited for the given requested_ft. """Returns a file to be edited for the given requested_ft.