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

Some more minor refactoring.

Browse Source
This commit is contained in:
Holger Rapp 2009-07-01 23:09:20 +02:00
parent fa71c6fb33
commit bf017ac7ea
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PySnipEmu.py
View File

@ -102,13 +102,10 @@ class TabStop(TextObject):
lineno, col = start lineno, col = start
newline = lineno + self._start[0] newline = lineno + self._start[0]
# TODO: remove span newcol = self._start[1] + self._delta_cols
if newline == lineno: if newline == lineno:
newcol = col + self.span[0] newcol += col
endcol = col + self.span[1]
else:
newcol = self.span[0]
endcol = self.span[1]
vim.current.window.cursor = newline, newcol vim.current.window.cursor = newline, newcol
@ -116,20 +113,16 @@ class TabStop(TextObject):
# Depending on the current mode and position, we # Depending on the current mode and position, we
# might need to move escape out of the mode and this # might need to move escape out of the mode and this
# will move our cursor one left # will move our cursor one left
if endcol-newcol > 0: if len(self._ct) > 0:
if newcol != 0 and vim.eval("mode()") == 'i': if newcol != 0 and vim.eval("mode()") == 'i':
move_one_right = "l" move_one_right = "l"
else: else:
move_one_right = "" move_one_right = ""
vim.command(r'call feedkeys("\<Esc>%sv%il\<c-g>")' vim.command(r'call feedkeys("\<Esc>%sv%il\<c-g>")'
% (move_one_right, endcol-newcol-1)) % (move_one_right, len(self._ct)-1))
@property
def span(self):
return (self._start[1]+self._delta_cols,self._start[1]+self._delta_cols+len(self._ct))
class SnippetInstance(TextObject): class SnippetInstance(TextObject):
""" """
A Snippet instance is an instance of a Snippet Definition. That is, A Snippet instance is an instance of a Snippet Definition. That is,
@ -256,7 +249,8 @@ class Snippet(object):
line_idx = val[:start].count('\n') line_idx = val[:start].count('\n')
line_start = val[:start].rfind('\n') + 1 line_start = val[:start].rfind('\n') + 1
start_in_line = start - line_start start_in_line = start - line_start
ts = TabStop(line_idx, (start_in_line,start_in_line+len(def_text)), def_text) ts = TabStop(line_idx, (start_in_line,start_in_line+len(def_text)),
def_text)
tabstops[no] = ts tabstops[no] = ts