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

Auto merge of #2488 - micbou:extra-conf-requests, r=puremourning

Browse Source 
[READY] Handle server exceptions from loading/ignoring extra conf

Since PR #2453, we don't catch anymore exceptions raised from loading or ignoring a `.ycm_extra_conf.py` file. For instance, loading this extra conf:
```python
raise Exception
```
will result in a Python traceback inside Vim. This is fixed by catching the `UnknownExtraConf` exception in its own block (as [it was before](48b7ccef76/python/ycm/client/event_notification.py (L64-L73))).

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/youcompleteme/2488)
<!-- Reviewable:end -->
This commit is contained in:
Homu 2017-01-04 07:30:23 +09:00
commit 3fde57b029
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
python/ycm/client/base_request.py
View File

@ -215,12 +215,13 @@ def HandleServerException( display = True, truncate = False ):
response = BaseRequest.PostDataToHandler( ... ) response = BaseRequest.PostDataToHandler( ... )
""" """
try: try:
yield try:
except UnknownExtraConf as e: yield
if vimsupport.Confirm( str( e ) ): except UnknownExtraConf as e:
_LoadExtraConfFile( e.extra_conf_file ) if vimsupport.Confirm( str( e ) ):
else: _LoadExtraConfFile( e.extra_conf_file )
_IgnoreExtraConfFile( e.extra_conf_file ) else:
_IgnoreExtraConfFile( e.extra_conf_file )
except Exception as e: except Exception as e:
_logger.exception( 'Error while handling server response' ) _logger.exception( 'Error while handling server response' )
if display: if display: