Skip to content

Commit 4d48dc5

Browse files
[skip changelog] Let sketch.Item.GetSourceStr return error
This adds an error return value to this method, which is currently always nil. This prepares for actually returning errors later.
1 parent 7b31ac3 commit 4d48dc5

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

Diff for: arduino/builder/sketch.go

+11-3
Original file line numberDiff line numberDiff line change
@@ -221,18 +221,26 @@ func SketchMergeSources(sketch *sketch.Sketch) (int, string, error) {
221221
mergedSource := ""
222222

223223
// add Arduino.h inclusion directive if missing
224-
if !includesArduinoH.MatchString(sketch.MainFile.GetSourceStr()) {
224+
mainSrc, err := sketch.MainFile.GetSourceStr()
225+
if err != nil {
226+
return 0, "", err
227+
}
228+
if !includesArduinoH.MatchString(mainSrc) {
225229
mergedSource += "#include <Arduino.h>\n"
226230
lineOffset++
227231
}
228232

229233
mergedSource += "#line 1 " + QuoteCppString(sketch.MainFile.Path) + "\n"
230-
mergedSource += sketch.MainFile.GetSourceStr() + "\n"
234+
mergedSource += mainSrc + "\n"
231235
lineOffset++
232236

233237
for _, item := range sketch.OtherSketchFiles {
238+
src, err := item.GetSourceStr()
239+
if err != nil {
240+
return 0, "", err
241+
}
234242
mergedSource += "#line 1 " + QuoteCppString(item.Path) + "\n"
235-
mergedSource += item.GetSourceStr() + "\n"
243+
mergedSource += src + "\n"
236244
}
237245

238246
return lineOffset, mergedSource, nil

Diff for: arduino/sketch/sketch.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ func NewItem(itemPath string) (*Item, error) {
4444
}
4545

4646
// GetSourceStr returns the Source contents in string format
47-
func (i *Item) GetSourceStr() string {
48-
return string(i.Source)
47+
func (i *Item) GetSourceStr() (string, error) {
48+
return string(i.Source), nil
4949
}
5050

5151
// ItemByPath implements sort.Interface for []Item based on

0 commit comments

Comments
 (0)