Converted AddPrototypes into a function

Author: cmaglie

legacy/builder/container_add_prototypes.go

@@ -56,18 +56,10 @@ func PreprocessSketchWithCtags(ctx *types.Context) error {
 		ctx.SketchSourceAfterCppPreprocessing = bldr.FilterSketchSource(ctx.Sketch, bytes.NewReader(src), false)
 	}
 
-	commands := []types.Command{
-		&CTagsRunner{Source: &ctx.SketchSourceAfterCppPreprocessing, TargetFileName: "sketch_merged.cpp"},
-		&PrototypesAdder{},
-	}
-
-	for _, command := range commands {
-		PrintRingNameIfDebug(ctx, command)
-		err := command.Run(ctx)
-		if err != nil {
-			return errors.WithStack(err)
-		}
+	if err := (&CTagsRunner{Source: &ctx.SketchSourceAfterCppPreprocessing, TargetFileName: "sketch_merged.cpp"}).Run(ctx); err != nil {
+		return errors.WithStack(err)
 	}
+	ctx.SketchSourceAfterArduinoPreprocessing, ctx.PrototypesSection = PrototypesAdder(ctx.SketchSourceMerged, ctx.PrototypesLineWhereToInsert, ctx.LineOffset, ctx.Prototypes, ctx.DebugPreprocessor)
 
 	if err := bldr.SketchSaveItemCpp(ctx.Sketch.MainFile, []byte(ctx.SketchSourceAfterArduinoPreprocessing), ctx.SketchBuildPath); err != nil {
 		return errors.WithStack(err)

legacy/builder/prototypes_adder.go

@@ -22,31 +22,21 @@ import (
 
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/ctags"
-	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/arduino/arduino-cli/legacy/builder/utils"
 )
 
-type PrototypesAdder struct{}
-
-func (s *PrototypesAdder) Run(ctx *types.Context) error {
-	debugOutput := ctx.DebugPreprocessor
-
-	source := ctx.SketchSourceMerged
+func PrototypesAdder(source string, firstFunctionLine, lineOffset int, prototypes []*ctags.Prototype, debugOutput bool) (preprocessedSource, prototypeSection string) {
 	source = strings.Replace(source, "\r\n", "\n", -1)
 	source = strings.Replace(source, "\r", "\n", -1)
-
 	sourceRows := strings.Split(source, "\n")
-
-	firstFunctionLine := ctx.PrototypesLineWhereToInsert
 	if isFirstFunctionOutsideOfSource(firstFunctionLine, sourceRows) {
-		return nil
+		return
 	}
 
-	insertionLine := firstFunctionLine + ctx.LineOffset - 1
+	insertionLine := firstFunctionLine + lineOffset - 1
 	firstFunctionChar := len(strings.Join(sourceRows[:insertionLine], "\n")) + 1
-	prototypeSection := composePrototypeSection(firstFunctionLine, ctx.Prototypes)
-	ctx.PrototypesSection = prototypeSection
-	source = source[:firstFunctionChar] + prototypeSection + source[firstFunctionChar:]
+	prototypeSection = composePrototypeSection(firstFunctionLine, prototypes)
+	preprocessedSource = source[:firstFunctionChar] + prototypeSection + source[firstFunctionChar:]
 
 	if debugOutput {
 		fmt.Println("#PREPROCESSED SOURCE")
@@ -63,9 +53,7 @@ func (s *PrototypesAdder) Run(ctx *types.Context) error {
 		}
 		fmt.Println("#END OF PREPROCESSED SOURCE")
 	}
-	ctx.SketchSourceAfterArduinoPreprocessing = source
-
-	return nil
+	return
 }
 
 func composePrototypeSection(line int, prototypes []*ctags.Prototype) string {