Skip to content

Commit 4da8e29

Browse files
committed
Fix handling of multiple items by includes not in library check
1 parent c0d9f38 commit 4da8e29

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Diff for: check/checkfunctions/library.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"github.com/arduino/arduino-check/project/sketch"
3434
"github.com/arduino/arduino-cli/arduino/libraries"
3535
"github.com/arduino/arduino-cli/arduino/utils"
36-
"github.com/arduino/go-properties-orderedmap"
3736
"github.com/go-git/go-git/v5"
3837
"github.com/go-git/go-git/v5/plumbing"
3938
"github.com/go-git/go-git/v5/plumbing/object"
@@ -925,12 +924,13 @@ func LibraryPropertiesIncludesFieldItemNotFound() (result checkresult.Type, outp
925924
return checkresult.NotRun, "Field not present"
926925
}
927926

928-
includesList, err := properties.SplitQuotedString(includes, "", false)
929-
if err != nil {
930-
panic(err)
931-
}
927+
includesList := strings.Split(includes, ",")
932928

933929
findInclude := func(include string) bool {
930+
include = strings.TrimSpace(include)
931+
if include == "" {
932+
return true
933+
}
934934
for _, header := range checkdata.SourceHeaders() {
935935
logrus.Tracef("Comparing include %s with header file %s", include, header)
936936
if include == header {

Diff for: check/checkfunctions/testdata/libraries/MissingIncludes/library.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ paragraph=Supports HTTP1.1 and you can do GET and POST.
77
category=Communication
88
url=http://example.com/
99
architectures=avr
10-
includes=Nonexistent.h
10+
includes=Nonexistent.h,MissingIncludes.h

0 commit comments

Comments
 (0)