fix multitab error reporting

facchinm · facchinm · commit 1dab82e2f5ff · 2016-03-04T11:17:06.000+01:00
Signed-off-by: Martino Facchin &lt;m.facchin@arduino.cc&gt;
diff --git a/src/arduino.cc/builder/prototypes_adder.go b/src/arduino.cc/builder/prototypes_adder.go
@@ -92,6 +92,7 @@ func composePrototypeSection(line int, prototypes []*types.Prototype) string {
 	str := joinPrototypes(prototypes)
 	str += "\n#line "
 	str += strconv.Itoa(line)
+	str += " \"" + prototypes[0].File + "\""
 	str += "\n"
 
 	return str
diff --git a/src/arduino.cc/builder/sketch_source_merger.go b/src/arduino.cc/builder/sketch_source_merger.go
@@ -48,7 +48,7 @@ func (s *SketchSourceMerger) Run(context map[string]interface{}) error {
 		includeSection += "#include <Arduino.h>\n"
 		lineOffset++
 	}
-	includeSection += "#line 1\n"
+	includeSection += "#line 1 \"" + strings.Replace((&sketch.MainFile).Name, "\\", "\\\\", -1) + "\"\n"
 	lineOffset++
 	context[constants.CTX_INCLUDE_SECTION] = includeSection
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func (s *SketchSourceMerger) Run(context map[string]interface{}) error {`
`48`	`48`	`includeSection += "#include <Arduino.h>\n"`
`49`	`49`	`lineOffset++`
`50`	`50`	`}`
`51`		`- includeSection += "#line 1\n"`
	`51`	`+ includeSection += "#line 1 \"" + strings.Replace((&sketch.MainFile).Name, "\\", "\\\\", -1) + "\"\n"`
`52`	`52`	`lineOffset++`
`53`	`53`	`context[constants.CTX_INCLUDE_SECTION] = includeSection`
`54`	`54`