VimPlug/jedi-vim
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi-vim.git synced 2025-12-07 19:24:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: rename() kept wrong cursor position #545

Browse Source 
The cursor would change to something else once in the insert mode. If
the new name was longer than the old one, the Parser couldn't get
the stmt at the wrong cursor position, thus rename failed.

Now save the cursor position before entering the insert mode. Then pass
the saved position to the 2nd call to the rename().
This commit is contained in:
mozbugbox
2016-03-20 23:05:15 +08:00
parent e7193b5e5f
commit 221d7dbee4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jedi_vim.py
View File

@@ -507,8 +507,10 @@ def cmdline_call_signatures(signatures):
@catch_and_print_exceptions
def rename():
if not int(vim.eval('a:0')):
# Need to save the cursor position before insert mode
cursor = vim.current.window.cursor
vim_command('augroup jedi_rename')
vim_command('autocmd InsertLeave <buffer> call jedi#rename(1)')
vim_command('autocmd InsertLeave <buffer> call jedi#rename({}, {})'.format(cursor[0], cursor[1]))
vim_command('augroup END')
vim_command("let s:jedi_replace_orig = expand('<cword>')")
@@ -520,6 +522,8 @@ def rename():
# Remove autocommand.
vim_command('autocmd! jedi_rename InsertLeave')
cursor = tuple(int(x) for x in vim.eval('a:000'))
# Get replacement, if there is something on the cursor.
# This won't be the case when the user ends insert mode right away,
# and `<cword>` would pick up the nearest word instead.
@@ -528,8 +532,6 @@ def rename():
else:
replace = None
cursor = vim.current.window.cursor
# Undo new word, but only if something was changed, which is not the
# case when ending insert mode right away.
if vim_eval('b:changedtick != s:jedi_changedtick') == '1':