@@ -22,7 +22,6 @@ import (
2222 "os"
2323 "strings"
2424
25- "github.com/arduino/arduino-cli/executils"
2625 "github.com/arduino/arduino-language-server/streams"
2726 "github.com/arduino/go-paths-helper"
2827 "github.com/fatih/color"
@@ -49,23 +48,22 @@ func newClangdLSPClient(logger jsonrpc.FunctionLogger, dataFolder *paths.Path, l
4948
5049 // Start clangd
5150 args := []string {
52- ls .config .ClangdPath .String (),
5351 "-log=verbose" ,
5452 fmt .Sprintf (`--compile-commands-dir=%s` , ls .buildPath ),
5553 }
5654 if dataFolder != nil {
5755 args = append (args , fmt .Sprintf ("-query-driver=%s" , dataFolder .Join ("packages" , "**" ).Canonical ()))
5856 }
5957
60- logger .Logf (" Starting clangd: %s" , strings .Join (args , " " ))
58+ logger .Logf (" Starting clangd: %s %s" , ls . config . ClangdPath , strings .Join (args , " " ))
6159 var clangdStdin io.WriteCloser
6260 var clangdStdout , clangdStderr io.ReadCloser
6361 var extraEnv []string
6462 if ls .tempDir != nil {
6563 extraEnv = append (extraEnv , "TMPDIR=" + ls .tempDir .String ()) // For unix-based systems
6664 extraEnv = append (extraEnv , "TMP=" + ls .tempDir .String ()) // For Windows
6765 }
68- if clangdCmd , err := executils . NewProcess (extraEnv , args ... ); err != nil {
66+ if clangdCmd , err := paths . NewProcessFromPath (extraEnv , ls . config . ClangdPath , args ... ); err != nil {
6967 panic ("starting clangd: " + err .Error ())
7068 } else if cin , err := clangdCmd .StdinPipe (); err != nil {
7169 panic ("getting clangd stdin: " + err .Error ())
0 commit comments