Skip to content

Fix error when attempting to determine Arduino data path from CLI output -- Needs review, not backwards compatible #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix error when attempting to determine Arduino data path from CLI output -- Needs review, not backwards compatible #182

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54ee1f2
Remove redundant logging call to a single spot
jmcclell Apr 9, 2024
3edba50
Add error handling for nil path
jmcclell Apr 9, 2024
1dcecae
Fix: Update JSON decode struct to match current Arduino CLI config st…
jmcclell Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ls/ls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1451,7 +1451,6 @@ func (ls *INOLanguageServer) extractDataFolderFromArduinoCLI(logger jsonrpc.Func
if err := json.Unmarshal([]byte(resp.JsonData), &dataDir); err != nil {
return nil, fmt.Errorf("error getting arduino data dir: %w", err)
}
logger.Logf("Arduino Data Dir -> %s", dataDir)
} else {
args := []string{
"--config-file", ls.config.CliConfigPath.String(),
Expand All @@ -1471,22 +1470,23 @@ func (ls *INOLanguageServer) extractDataFolderFromArduinoCLI(logger jsonrpc.Func
}

type cmdRes struct {
Config struct {
Directories struct {
Data string `json:"data"`
} `json:"directories"`
} `json:"config"`
Directories struct {
Data string `json:"data"`
} `json:"directories"`
}
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.Config.Directories.Data)
dataDir = res.Config.Directories.Data
dataDir = res.Directories.Data
}

logger.Logf("Arduino Data Dir -> %s", dataDir)
dataDirPath := paths.New(dataDir)
if dataDirPath == nil {
return nil, errors.Errorf("error creating path from %s", dataDir)
}
return dataDirPath.Canonical(), nil
}

Expand Down
Loading