Fix for rare crash when trying to jump to file which has .swp
This commit is contained in:
parent
d98298ab87
commit
a0495a994e
@ -356,8 +356,22 @@ def JumpToLocation( filename, line, column ):
|
|||||||
command = BUFFER_COMMAND_MAP.get( user_command, 'edit' )
|
command = BUFFER_COMMAND_MAP.get( user_command, 'edit' )
|
||||||
if command == 'edit' and not BufferIsUsable( vim.current.buffer ):
|
if command == 'edit' and not BufferIsUsable( vim.current.buffer ):
|
||||||
command = 'split'
|
command = 'split'
|
||||||
|
try:
|
||||||
vim.command( 'keepjumps {0} {1}'.format( command,
|
vim.command( 'keepjumps {0} {1}'.format( command,
|
||||||
EscapedFilepath( filename ) ) )
|
EscapedFilepath( filename ) ) )
|
||||||
|
# When the file we are trying to jump to has a swap file
|
||||||
|
# Vim opens swap-exists-choices dialog and throws vim.error with E325 error,
|
||||||
|
# or KeyboardInterrupt after user selects one of the options.
|
||||||
|
except vim.error as e:
|
||||||
|
if 'E325' in str(e):
|
||||||
|
# Do nothing if the target file is still not opened (user chose (Q)uit)
|
||||||
|
if filename != GetCurrentBufferFilepath():
|
||||||
|
return
|
||||||
|
else:
|
||||||
|
raise
|
||||||
|
# Thrown when user chooses (A)bort in .swp message box
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
return
|
||||||
vim.current.window.cursor = ( line, column - 1 )
|
vim.current.window.cursor = ( line, column - 1 )
|
||||||
|
|
||||||
# Center the screen on the jumped-to location
|
# Center the screen on the jumped-to location
|
||||||
|
Loading…
Reference in New Issue
Block a user