Disable LSP server restarts for unit tests

9fans · Jun 18, 2023 · 737a43a · 737a43a
1 parent 3e61d87
commit 737a43a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/internal/lsp/acmelsp/client_test.go b/internal/lsp/acmelsp/client_test.go
@@ -73,7 +73,7 @@ func testGoModule(t *testing.T, server string, src string, f func(t *testing.T,
  RootDirectory: dir,
  DiagWriter: &mockDiagosticsWriter{ioutil.Discard},
  Workspaces: nil,
- })
+ }, false)
  if err != nil {
  t.Fatalf("startServer failed: %v", err)
  }
@@ -297,7 +297,7 @@ func main() {
  RootDirectory: dir,
  DiagWriter: &chanDiagosticsWriter{ch},
  Workspaces: nil,
- })
+ }, false)
  if err != nil {
  t.Fatalf("startServer failed: %v", err)
  }
@@ -366,7 +366,7 @@ func testPython(t *testing.T, src string, f func(t *testing.T, c *Client, uri pr
  RootDirectory: dir,
  DiagWriter: &mockDiagosticsWriter{ioutil.Discard},
  Workspaces: nil,
- })
+ }, false)
  if err != nil {
  t.Fatalf("startServer failed: %v", err)
  }

diff --git a/internal/lsp/acmelsp/exec.go b/internal/lsp/acmelsp/exec.go
@@ -31,7 +31,7 @@ func (s *Server) Close() {
  }
 }
 
-func execServer(cs *config.Server, cfg *ClientConfig) (*Server, error) {
+func execServer(cs *config.Server, cfg *ClientConfig, restartOnExit bool) (*Server, error) {
  args := cs.Command
 
  stderr := os.Stderr
@@ -69,11 +69,15 @@ func execServer(cs *config.Server, cfg *ClientConfig) (*Server, error) {
  go func() {
  for {
  err := cmd.Wait()
- log.Printf("language server %v exited: %v; restarting...", args[0], err)
+ log.Printf("language server %v exited: %v", args[0], err)
 
  // TODO(fhs): cancel using context?
  srv.conn.Close()
+ if !restartOnExit {
+ break
+ }
 
+ log.Printf("restarting language server %v after exit", args[0])
  cmd, p1, err = startCommand()
  if err != nil {
  log.Printf("%v", err)
@@ -138,7 +142,7 @@ func (info *ServerInfo) start(cfg *ClientConfig) (*Server, error) {
  }
  info.srv = srv
  } else {
- srv, err := execServer(info.Server, cfg)
+ srv, err := execServer(info.Server, cfg, true)
  if err != nil {
  return nil, err
  }