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

Auto merge of #1732 - davits:master, r=Valloric

Browse Source 
Fix rare crash when trying to jump to file which has .swp

One of my coworkers found this crash today. Usually he opens a lot of gvim-s and forgets about them, and eventually one of GoToDefinition commands backfired :)

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/valloric/youcompleteme/1732)
<!-- Reviewable:end -->
This commit is contained in:
Homu 2015-10-19 04:00:16 +09:00
commit a0817e6f9c
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
python/ycm/vimsupport.py
View File

@ -326,10 +326,17 @@ def TryJumpLocationInOpenedTab( filename, line, column ):
# Center the screen on the jumped-to location # Center the screen on the jumped-to location
vim.command( 'normal! zz' ) vim.command( 'normal! zz' )
return return True
else: # 'filename' is not opened in any tab pages
# 'filename' is not opened in any tab pages return False
raise ValueError
# Maps User jump command to vim jump command
def GetVimJumpCommand( user_command ):
vim_command = BUFFER_COMMAND_MAP.get( user_command, 'edit' )
if vim_command == 'edit' and not BufferIsUsable( vim.current.buffer ):
vim_command = 'split'
return vim_command
# Both |line| and |column| need to be 1-based # Both |line| and |column| need to be 1-based
@ -347,17 +354,26 @@ def JumpToLocation( filename, line, column ):
user_command = user_options_store.Value( 'goto_buffer_command' ) user_command = user_options_store.Value( 'goto_buffer_command' )
if user_command == 'new-or-existing-tab': if user_command == 'new-or-existing-tab':
try: if TryJumpLocationInOpenedTab( filename, line, column ):
TryJumpLocationInOpenedTab( filename, line, column )
return return
except ValueError: user_command = 'new-tab'
user_command = 'new-tab'
command = BUFFER_COMMAND_MAP.get( user_command, 'edit' ) vim_command = GetVimJumpCommand( user_command )
if command == 'edit' and not BufferIsUsable( vim.current.buffer ): try:
command = 'split' vim.command( 'keepjumps {0} {1}'.format( vim_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' not in str( e ):
raise
# Do nothing if the target file is still not opened (user chose (Q)uit)
if filename != GetCurrentBufferFilepath():
return
# 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