From 32e3494d6e8c29e0c45890393f435067f59697de Mon Sep 17 00:00:00 2001 From: Strahinja Val Markovic Date: Wed, 20 Aug 2014 13:40:17 -0700 Subject: [PATCH] Handling os.getcwd() throwing an exception. This can happen if the CWD has been deleted. Fixes #1129 --- python/ycm/vimsupport.py | 10 ++++++++-- python/ycm/youcompleteme.py | 6 +++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/python/ycm/vimsupport.py b/python/ycm/vimsupport.py index a97924e6..aa0b4b99 100644 --- a/python/ycm/vimsupport.py +++ b/python/ycm/vimsupport.py @@ -19,6 +19,7 @@ import vim import os +import tempfile import json from ycmd.utils import ToUtf8IfNeeded from ycmd import user_options_store @@ -123,8 +124,13 @@ def GetBufferFilepath( buffer_object ): if buffer_object.name: return buffer_object.name # Buffers that have just been created by a command like :enew don't have any - # buffer name so we use the buffer number for that. - return os.path.join( os.getcwd(), str( buffer_object.number ) ) + # buffer name so we use the buffer number for that. Also, os.getcwd() throws + # an exception when the CWD has been deleted so we handle that. + try: + folder_path = os.getcwd() + except OSError: + folder_path = tempfile.gettempdir() + return os.path.join( folder_path, str( buffer_object.number ) ) # NOTE: This unplaces *all* signs in a buffer, not just the ones we placed. We diff --git a/python/ycm/youcompleteme.py b/python/ycm/youcompleteme.py index e9fc72a3..0af78fe0 100644 --- a/python/ycm/youcompleteme.py +++ b/python/ycm/youcompleteme.py @@ -353,7 +353,11 @@ class YouCompleteMe( object ): def _AddTagsFilesIfNeeded( self, extra_data ): def GetTagFiles(): tag_files = vim.eval( 'tagfiles()' ) - current_working_directory = os.getcwd() + # getcwd() throws an exception when the CWD has been deleted. + try: + current_working_directory = os.getcwd() + except OSError: + return [] return [ os.path.join( current_working_directory, x ) for x in tag_files ] if not self._user_options[ 'collect_identifiers_from_tags_files' ]: