Improved error messages for .cpp/.h file in the sketch (arduino#1224)

cmaglie · Oliver Schönrock · web-flow · commit ab58758347e1 · 2021-03-17T15:00:45.000+01:00
Add #line tags to AdditionalFiles when copying to build directory 

Co-authored-by: Oliver Schönrock &lt;oliver@openbrackets.net&gt;
diff --git a/arduino/builder/sketch.go b/arduino/builder/sketch.go
@@ -289,6 +289,9 @@ func SketchCopyAdditionalFiles(sketch *sketch.Sketch, destPath string, overrides
 			sourceBytes = s
 		}
 
+		// tag each addtional file with the filename of the source it was copied from
+		sourceBytes = append([]byte("#line 1 "+QuoteCppString(item.Path)+"\n"), sourceBytes...)
+
 		err = writeIfDifferent(sourceBytes, targetPath)
 		if err != nil {
 			return errors.Wrap(err, "unable to write to destination file")

Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,9 @@ func SketchCopyAdditionalFiles(sketch *sketch.Sketch, destPath string, overrides`
`289`	`289`	`sourceBytes = s`
`290`	`290`	`}`
`291`	`291`
	`292`	`+ // tag each addtional file with the filename of the source it was copied from`
	`293`	`+ sourceBytes = append([]byte("#line 1 "+QuoteCppString(item.Path)+"\n"), sourceBytes...)`
	`294`	`+`
`292`	`295`	`err = writeIfDifferent(sourceBytes, targetPath)`
`293`	`296`	`if err != nil {`
`294`	`297`	`return errors.Wrap(err, "unable to write to destination file")`