Skip to content

Commit bb29960

Browse files
committed
Replaced outdated executils library
1 parent 1ccd378 commit bb29960

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

Diff for: ls/builder.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727

2828
"github.com/arduino/arduino-cli/arduino/builder"
2929
"github.com/arduino/arduino-cli/arduino/libraries"
30-
"github.com/arduino/arduino-cli/executils"
3130
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
3231
"github.com/arduino/arduino-language-server/sourcemapper"
3332
"github.com/arduino/arduino-language-server/streams"
@@ -275,7 +274,7 @@ func (ls *INOLanguageServer) generateBuildEnvironment(ctx context.Context, fullB
275274
}
276275

277276
// Run arduino-cli to perform the build
278-
args := []string{config.CliPath.String(),
277+
args := []string{
279278
"--config-file", config.CliConfigPath.String(),
280279
"compile",
281280
"--fqbn", config.Fqbn,
@@ -289,7 +288,7 @@ func (ls *INOLanguageServer) generateBuildEnvironment(ctx context.Context, fullB
289288
}
290289
args = append(args, sketchRoot.String())
291290

292-
cmd, err := executils.NewProcess(nil, args...)
291+
cmd, err := paths.NewProcessFromPath(nil, config.CliPath, args...)
293292
if err != nil {
294293
return false, errors.Errorf("running %s: %s", strings.Join(args, " "), err)
295294
}

Diff for: ls/ls.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"sync"
2929
"time"
3030

31-
"github.com/arduino/arduino-cli/executils"
3231
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/settings/v1"
3332
"github.com/arduino/arduino-language-server/globals"
3433
"github.com/arduino/arduino-language-server/sourcemapper"
@@ -1449,13 +1448,13 @@ func (ls *INOLanguageServer) extractDataFolderFromArduinoCLI(logger jsonrpc.Func
14491448
}
14501449
logger.Logf("Arduino Data Dir -> %s", dataDir)
14511450
} else {
1452-
args := []string{ls.config.CliPath.String(),
1451+
args := []string{
14531452
"--config-file", ls.config.CliConfigPath.String(),
14541453
"config",
14551454
"dump",
14561455
"--format", "json",
14571456
}
1458-
cmd, err := executils.NewProcess(nil, args...)
1457+
cmd, err := paths.NewProcessFromPath(nil, ls.config.CliPath, args...)
14591458
if err != nil {
14601459
return nil, errors.Errorf("running %s: %s", strings.Join(args, " "), err)
14611460
}

Diff for: ls/lsp_client_clangd.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -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

Comments
 (0)