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

Auto merge of #2704 - micbou:stop-polling-if-server-crashed, r=bstaletic

Browse Source 
[READY] Stop polling for readiness if the server crashed

There is no need to continue polling the server if its process has terminated (i.e. the server crashed). This fixes issue https://github.com/Valloric/YouCompleteMe/issues/2683 when the server is not working.

<!-- 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/2704)
<!-- Reviewable:end -->
This commit is contained in:
zzbot 2017-07-05 01:28:17 -07:00 committed by GitHub
commit bd302907f5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
autoload/youcompleteme.vim
View File

@ -486,6 +486,11 @@ endfunction
function! s:PollServerReady( timer_id ) function! s:PollServerReady( timer_id )
if !s:Pyeval( 'ycm_state.IsServerAlive()' )
" Server crashed. Don't poll it again.
return
endif
if !s:Pyeval( 'ycm_state.CheckIfServerIsReady()' ) if !s:Pyeval( 'ycm_state.CheckIfServerIsReady()' )
let s:pollers.server_ready.id = timer_start( let s:pollers.server_ready.id = timer_start(
\ s:pollers.server_ready.wait_milliseconds, \ s:pollers.server_ready.wait_milliseconds,

2
python/ycm/youcompleteme.py
View File

@ -221,7 +221,7 @@ class YouCompleteMe( object ):
def CheckIfServerIsReady( self ): def CheckIfServerIsReady( self ):
if not self._server_is_ready_with_cache and self.IsServerAlive(): if not self._server_is_ready_with_cache:
with HandleServerException( display = False ): with HandleServerException( display = False ):
self._server_is_ready_with_cache = BaseRequest.GetDataFromHandler( self._server_is_ready_with_cache = BaseRequest.GetDataFromHandler(
'ready' ) 'ready' )