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

Fix selecting one more character when using ${VISUAL} on Windows.

Browse Source
This commit is contained in:
Johnson 2017-06-23 10:23:58 +08:00
parent 113a901f41
commit b9f4438aeb
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pythonx/UltiSnips/vim_state.py
View File

@ -8,6 +8,7 @@ from collections import deque, namedtuple
from UltiSnips import _vim from UltiSnips import _vim
from UltiSnips.compatibility import as_unicode, byte2col from UltiSnips.compatibility import as_unicode, byte2col
from UltiSnips.position import Position from UltiSnips.position import Position
import platform
_Placeholder = namedtuple('_FrozenPlaceholder', ['current_text', 'start', 'end']) _Placeholder = namedtuple('_FrozenPlaceholder', ['current_text', 'start', 'end'])
@ -117,7 +118,7 @@ class VisualContentPreserver(object):
self._placeholder = None self._placeholder = None
def conserve(self): def conserve(self):
"""Save the last visual selection ond the mode it was made in.""" """Save the last visual selection and the mode it was made in."""
sl, sbyte = map(int, sl, sbyte = map(int,
(_vim.eval("""line("'<")"""), _vim.eval("""col("'<")"""))) (_vim.eval("""line("'<")"""), _vim.eval("""col("'<")""")))
el, ebyte = map(int, el, ebyte = map(int,
@ -128,13 +129,19 @@ class VisualContentPreserver(object):
_vim_line_with_eol = lambda ln: _vim.buf[ln] + '\n' _vim_line_with_eol = lambda ln: _vim.buf[ln] + '\n'
# Remove last character for windows
if platform.system() == 'Windows':
add = 0
else:
add = 1
if sl == el: if sl == el:
text = _vim_line_with_eol(sl - 1)[sc:ec + 1] text = _vim_line_with_eol(sl - 1)[sc:ec + add]
else: else:
text = _vim_line_with_eol(sl - 1)[sc:] text = _vim_line_with_eol(sl - 1)[sc:]
for cl in range(sl, el - 1): for cl in range(sl, el - 1):
text += _vim_line_with_eol(cl) text += _vim_line_with_eol(cl)
text += _vim_line_with_eol(el - 1)[:ec + 1] text += _vim_line_with_eol(el - 1)[:ec + add]
self._text = text self._text = text
def conserve_placeholder(self, placeholder): def conserve_placeholder(self, placeholder):