VimPlug/jedi-vim-fork
1
0
Fork 0
forked from VimPlug/jedi-vim
Code Pull Requests Activity

Track undo properly in rename(). Fix #502

Browse Source 
Use vim changenr() call to track change and undo. This is more
robust than bindly call 'normal! u'
This commit is contained in:
mozbugbox
2016-03-21 09:53:57 +08:00
parent 221d7dbee4
commit 794af5b90a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jedi_vim.py
View File

@@ -509,8 +509,10 @@ def rename():
if not int(vim.eval('a:0')): if not int(vim.eval('a:0')):
# Need to save the cursor position before insert mode # Need to save the cursor position before insert mode
cursor = vim.current.window.cursor cursor = vim.current.window.cursor
changenr = vim.eval('changenr()') # track undo tree
vim_command('augroup jedi_rename') vim_command('augroup jedi_rename')
vim_command('autocmd InsertLeave <buffer> call jedi#rename({}, {})'.format(cursor[0], cursor[1])) vim_command('autocmd InsertLeave <buffer> call jedi#rename'
'({}, {}, {})'.format(cursor[0], cursor[1], changenr))
vim_command('augroup END') vim_command('augroup END')
vim_command("let s:jedi_replace_orig = expand('<cword>')") vim_command("let s:jedi_replace_orig = expand('<cword>')")
@@ -522,7 +524,9 @@ def rename():
# Remove autocommand. # Remove autocommand.
vim_command('autocmd! jedi_rename InsertLeave') vim_command('autocmd! jedi_rename InsertLeave')
cursor = tuple(int(x) for x in vim.eval('a:000')) args = vim.eval('a:000')
cursor = tuple(int(x) for x in args[:2])
changenr = args[2]
# Get replacement, if there is something on the cursor. # Get replacement, if there is something on the cursor.
# This won't be the case when the user ends insert mode right away, # This won't be the case when the user ends insert mode right away,
@@ -532,11 +536,7 @@ def rename():
else: else:
replace = None replace = None
# Undo new word, but only if something was changed, which is not the vim_command('undo {}'.format(changenr))
# case when ending insert mode right away.
if vim_eval('b:changedtick != s:jedi_changedtick') == '1':
vim_command('normal! u') # Undo new word.
vim_command('normal! u') # Undo diw.
vim.current.window.cursor = cursor vim.current.window.cursor = cursor