Merge pull request #2507 from bhcleek/lsp/fix-clean

lsp: fix CleanWorkspaces

Author: bhcleek

.travis.yml

@@ -14,9 +14,9 @@ install:
   - ./scripts/install-vim $VIM_VERSION
   - |
     if [ "$ENV" = "vimlint" ]; then
-      pip install vim-vint covimerage codecov pathlib
+      pip install vim-vint covimerage==0.1.6 codecov pathlib
     else
-      pip install --user vim-vint covimerage codecov pathlib
+      pip install --user vim-vint covimerage==0.1.6 codecov pathlib
     fi
 script:
   - ./scripts/$SCRIPT $VIM_VERSION

autoload/go/config_test.vim

@@ -74,6 +74,7 @@ func! Test_SetBuildTags() abort
     let l:lsplog = getbufline('__GOLSP_LOG__', 1, '$')
 
   finally
+    call go#config#SetBuildTags('')
     unlet g:go_def_mode
   endtry
 endfunc

autoload/go/lsp.vim

@@ -746,13 +746,17 @@ function! go#lsp#CleanWorkspaces() abort
   let l:missing = []
   for l:dir in l:lsp.workspaceDirectories
     if !isdirectory(l:dir)
-      let l:dir = add(l:missing, l:dir)
+      let l:missing = add(l:missing, l:dir)
       call remove(l:lsp.workspaceDirectories, l:i)
       continue
     endif
     let l:i += 1
   endfor
 
+  if len(l:missing) == 0
+    return 0
+  endif
+
   let l:state = s:newHandlerState('')
   let l:state.handleResult = funcref('s:noop')
   let l:msg = go#lsp#message#ChangeWorkspaceFolders([], l:missing)
@@ -789,14 +793,26 @@ function! go#lsp#DebugBrowser() abort
   call go#util#OpenBrowser(printf('http://localhost:%d', l:port))
 endfunction
 
+function! go#lsp#Exit() abort
+  call s:exit(0)
+endfunction
+
 function! go#lsp#Restart() abort
+  call s:exit(1)
+endfunction
+
+function! s:exit(restart) abort
   if !go#util#has_job() || len(s:lspfactory) == 0 || !has_key(s:lspfactory, 'current')
     return
   endif
 
   let l:lsp = s:lspfactory.get()
 
-  let l:lsp.restarting = 1
+  " reset the factory so that future requests don't use the same instance of
+  " gopls.
+  call s:lspfactory.reset()
+
+  let l:lsp.restarting = a:restart
 
   let l:state = s:newHandlerState('exit')
 

scripts/runtest.vim

@@ -74,12 +74,16 @@ for s:test in sort(s:tests)
     let v:errors += [v:exception]
   endtry
 
+  let s:elapsed_time = substitute(reltimestr(reltime(s:started)), '^\s*\(.\{-}\)\s*$', '\1', '')
+
   " Restore GOPATH after each test.
   let $GOPATH = s:gopath
   " Restore the working directory after each test.
   execute s:cd . s:dir
 
-  let s:elapsed_time = substitute(reltimestr(reltime(s:started)), '^\s*\(.\{-}\)\s*$', '\1', '')
+  " exit gopls after each test
+  call go#lsp#Exit()
+
   let s:done += 1
 
   if len(v:errors) > 0