From 8e38a131d19e9cac4131fd2d5e1b8830381702f5 Mon Sep 17 00:00:00 2001 From: Nicolas Peugnet Date: Wed, 17 Jan 2024 18:26:33 +0100 Subject: [PATCH] Fix panic in extractDataFolderFromArduinoCLI When using the latest arduino CLI (nightly-20240102 Commit: db53f81) the return of `arduino-cli config dump` looks like: { "config": { "directories": { "data": "/home/nicolas/.arduino15", "downloads": "/home/nicolas/.arduino15/staging", "user": "/home/nicolas/Arduino" } } } --- ls/ls.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ls/ls.go b/ls/ls.go index f8121f1..ab46647 100644 --- a/ls/ls.go +++ b/ls/ls.go @@ -1470,17 +1470,19 @@ func (ls *INOLanguageServer) extractDataFolderFromArduinoCLI(logger jsonrpc.Func } type cmdRes struct { - Directories struct { - Data string `json:"data"` - } `json:"directories"` + Config struct { + Directories struct { + Data string `json:"data"` + } `json:"directories"` + } `json:"config"` } var res cmdRes if err := json.Unmarshal(cmdOutput.Bytes(), &res); err != nil { return nil, errors.Errorf("parsing arduino-cli output: %s", err) } // Return only the build path - logger.Logf("Arduino Data Dir -> %s", res.Directories.Data) - dataDir = res.Directories.Data + logger.Logf("Arduino Data Dir -> %s", res.Config.Directories.Data) + dataDir = res.Config.Directories.Data } dataDirPath := paths.New(dataDir)