Skip to content

Commit 87bb2c8

Browse files
authored
Merge pull request #175 from n-peugnet/fix-extractdatafolder-cli
Fix panic in extractDataFolderFromArduinoCLI
2 parents e2ed6de + 8e38a13 commit 87bb2c8

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

Diff for: ls/ls.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -1470,17 +1470,19 @@ func (ls *INOLanguageServer) extractDataFolderFromArduinoCLI(logger jsonrpc.Func
14701470
}
14711471

14721472
type cmdRes struct {
1473-
Directories struct {
1474-
Data string `json:"data"`
1475-
} `json:"directories"`
1473+
Config struct {
1474+
Directories struct {
1475+
Data string `json:"data"`
1476+
} `json:"directories"`
1477+
} `json:"config"`
14761478
}
14771479
var res cmdRes
14781480
if err := json.Unmarshal(cmdOutput.Bytes(), &res); err != nil {
14791481
return nil, errors.Errorf("parsing arduino-cli output: %s", err)
14801482
}
14811483
// Return only the build path
1482-
logger.Logf("Arduino Data Dir -> %s", res.Directories.Data)
1483-
dataDir = res.Directories.Data
1484+
logger.Logf("Arduino Data Dir -> %s", res.Config.Directories.Data)
1485+
dataDir = res.Config.Directories.Data
14841486
}
14851487

14861488
dataDirPath := paths.New(dataDir)

0 commit comments

Comments
 (0)