File tree 1 file changed +5
-13
lines changed
Filter options
1 file changed +5
-13
lines changed
Original file line number Diff line number Diff line change @@ -1455,9 +1455,8 @@ func (ls *INOLanguageServer) extractDataFolderFromArduinoCLI(logger jsonrpc.Func
1455
1455
} else {
1456
1456
args := []string {
1457
1457
"--config-file" , ls .config .CliConfigPath .String (),
1458
- "config" ,
1459
- "dump" ,
1460
- "--format" , "json" ,
1458
+ "config" , "get" , "directories.data" ,
1459
+ "--json" ,
1461
1460
}
1462
1461
cmd , err := paths .NewProcessFromPath (nil , ls .config .CliPath , args ... )
1463
1462
if err != nil {
@@ -1470,20 +1469,13 @@ func (ls *INOLanguageServer) extractDataFolderFromArduinoCLI(logger jsonrpc.Func
1470
1469
return nil , errors .Errorf ("running %s: %s" , strings .Join (args , " " ), err )
1471
1470
}
1472
1471
1473
- type cmdRes struct {
1474
- Config struct {
1475
- Directories struct {
1476
- Data string `json:"data"`
1477
- } `json:"directories"`
1478
- } `json:"config"`
1479
- }
1480
- var res cmdRes
1472
+ var res string
1481
1473
if err := json .Unmarshal (cmdOutput .Bytes (), & res ); err != nil {
1482
1474
return nil , errors .Errorf ("parsing arduino-cli output: %s" , err )
1483
1475
}
1484
1476
// Return only the build path
1485
- logger .Logf ("Arduino Data Dir -> %s" , res . Config . Directories . Data )
1486
- dataDir = res . Config . Directories . Data
1477
+ logger .Logf ("Arduino Data Dir -> %s" , res )
1478
+ dataDir = res
1487
1479
}
1488
1480
1489
1481
dataDirPath := paths .New (dataDir )
You can’t perform that action at this time.
0 commit comments