Moved list cleanup into unescapeAndSplit

cmaglie · cmaglie · commit 77848632e342 · 2025-11-19T12:55:41.000+01:00
diff --git a/internal/arduino/builder/cpp/depfile.go b/internal/arduino/builder/cpp/depfile.go
@@ -59,8 +59,6 @@ func readDepFile(depFile string) (*Dependencies, error) {
 	if err != nil {
 		return nil, err
 	}
-	rows = f.Map(rows, strings.TrimSpace)
-	rows = f.Filter(rows, f.NotEquals(""))
 	if len(rows) == 0 {
 		return &Dependencies{}, nil
 	}
@@ -135,5 +133,7 @@ func unescapeAndSplit(s string) ([]string, error) {
 	if current.Len() > 0 {
 		res = append(res, current.String())
 	}
+	res = f.Map(res, strings.TrimSpace)
+	res = f.Filter(res, f.NotEquals(""))
 	return res, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,6 @@ func readDepFile(depFile string) (*Dependencies, error) {`
`59`	`59`	`if err != nil {`
`60`	`60`	`return nil, err`
`61`	`61`	`}`
`62`		`- rows = f.Map(rows, strings.TrimSpace)`
`63`		`- rows = f.Filter(rows, f.NotEquals(""))`
`64`	`62`	`if len(rows) == 0 {`
`65`	`63`	`return &Dependencies{}, nil`
`66`	`64`	`}`
`@@ -135,5 +133,7 @@ func unescapeAndSplit(s string) ([]string, error) {`
`135`	`133`	`if current.Len() > 0 {`
`136`	`134`	`res = append(res, current.String())`
`137`	`135`	`}`
	`136`	`+ res = f.Map(res, strings.TrimSpace)`
	`137`	`+ res = f.Filter(res, f.NotEquals(""))`
`138`	`138`	`return res, nil`
`139`	`139`	`}`