From e7e6bd955d50f2f9f9eb26a189b6f814a742ee0a Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Thu, 9 Nov 2017 20:43:09 +0800 Subject: [PATCH] Fix lint --- autoload/SpaceVim/server.vim | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/autoload/SpaceVim/server.vim b/autoload/SpaceVim/server.vim index 477ae086f..63bbdf3f4 100644 --- a/autoload/SpaceVim/server.vim +++ b/autoload/SpaceVim/server.vim @@ -8,22 +8,27 @@ +" This function should not be called twice! +let s:flag = 0 function! SpaceVim#server#connect() - if empty($SPACEVIM_SERVER_ADDRESS) - let $SPACEVIM_SERVER_ADDRESS = fnamemodify('/tmp/' . (has('nvim') ? 'spacevim_nvim_' : 'spacevim_vim_') . 'server', ':p') - endif - if has('nvim') - try - call serverstart($SPACEVIM_SERVER_ADDRESS) - call SpaceVim#logger#info('SpaceVim server startup at:' . $SPACEVIM_SERVER_ADDRESS) - catch /Failed to start server: address already in use/ - endtry - elseif has('clientserver') && exists('*remote_startserver') - if index(split(serverlist(), "\n"), $SPACEVIM_SERVER_ADDRESS) == -1 - call remote_startserver($SPACEVIM_SERVER_ADDRESS) - call SpaceVim#logger#info('SpaceVim server startup at:' . $SPACEVIM_SERVER_ADDRESS) + if s:flag == 0 + if empty($SPACEVIM_SERVER_ADDRESS) + let $SPACEVIM_SERVER_ADDRESS = fnamemodify('/tmp/' . (has('nvim') ? 'spacevim_nvim_' : 'spacevim_vim_') . 'server', ':p') endif + if has('nvim') + try + call serverstart($SPACEVIM_SERVER_ADDRESS) + call SpaceVim#logger#info('SpaceVim server startup at:' . $SPACEVIM_SERVER_ADDRESS) + catch /Failed to start server: address already in use/ + endtry + elseif has('clientserver') && exists('*remote_startserver') + if index(split(serverlist(), "\n"), $SPACEVIM_SERVER_ADDRESS) == -1 + call remote_startserver($SPACEVIM_SERVER_ADDRESS) + call SpaceVim#logger#info('SpaceVim server startup at:' . $SPACEVIM_SERVER_ADDRESS) + endif + endif + let s:flag = 1 endif endfunction