Moved RunCTags out of legacy package

Author: cmaglie

legacy/builder/ctags_runner.go renamed to arduino/builder/preprocessor/ctags.go

@@ -1,6 +1,6 @@
 // This file is part of arduino-cli.
 //
-// Copyright 2020 ARDUINO SA (http://www.arduino.cc/)
+// Copyright 2023 ARDUINO SA (http://www.arduino.cc/)
 //
 // This software is released under the GNU General Public License version 3,
 // which covers the main part of arduino-cli.
@@ -13,18 +13,22 @@
 // Arduino software without disclosing the source code of your own applications.
 // To purchase a commercial license, send an email to license@arduino.cc.
 
-package builder
+package preprocessor
 
 import (
-	"bytes"
+	"context"
+	"fmt"
 	"strings"
 
 	"github.com/arduino/arduino-cli/executils"
+	"github.com/arduino/arduino-cli/i18n"
 	"github.com/arduino/go-paths-helper"
-	properties "github.com/arduino/go-properties-orderedmap"
+	"github.com/arduino/go-properties-orderedmap"
 	"github.com/pkg/errors"
 )
 
+var tr = i18n.Tr
+
 func RunCTags(sourceFile *paths.Path, buildProperties *properties.Map) ([]byte, []byte, error) {
 	ctagsBuildProperties := properties.NewMap()
 	ctagsBuildProperties.Set("tools.ctags.path", "{runtime.tools.ctags.path}")
@@ -48,13 +52,10 @@ func RunCTags(sourceFile *paths.Path, buildProperties *properties.Map) ([]byte,
 	if err != nil {
 		return nil, nil, err
 	}
-	stdout := &bytes.Buffer{}
-	stderr := &bytes.Buffer{}
-	proc.RedirectStdoutTo(stdout)
-	proc.RedirectStderrTo(stderr)
-	if err = proc.Run(); err != nil {
-		return nil, nil, err
-	}
-	_, _ = stderr.WriteString(strings.Join(parts, " "))
-	return stdout.Bytes(), stderr.Bytes(), err
+	stdout, stderr, err := proc.RunAndCaptureOutput(context.Background())
+
+	// Append ctags arguments to stderr
+	args := fmt.Sprintln(strings.Join(parts, " "))
+	stderr = append([]byte(args), stderr...)
+	return stdout, stderr, err
 }

legacy/builder/container_add_prototypes.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 
 	bldr "github.com/arduino/arduino-cli/arduino/builder"
+	"github.com/arduino/arduino-cli/arduino/builder/preprocessor"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/pkg/errors"
 )
@@ -60,7 +61,7 @@ func PreprocessSketchWithCtags(ctx *types.Context) error {
 		return err
 	}
 
-	ctagsStdout, ctagsStderr, err := RunCTags(targetFilePath, ctx.BuildProperties)
+	ctagsStdout, ctagsStderr, err := preprocessor.RunCTags(targetFilePath, ctx.BuildProperties)
 	if ctx.Verbose {
 		ctx.WriteStderr(ctagsStderr)
 	}

legacy/builder/test/ctags_runner_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 
 	bldr "github.com/arduino/arduino-cli/arduino/builder"
+	"github.com/arduino/arduino-cli/arduino/builder/preprocessor"
 	"github.com/arduino/arduino-cli/legacy/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	paths "github.com/arduino/go-paths-helper"
@@ -53,7 +54,7 @@ func ctagsRunnerTestTemplate(t *testing.T, sketchLocation *paths.Path) []byte {
 	NoError(t, target.Parent().MkdirAll())
 	NoError(t, target.WriteFile([]byte(source)))
 
-	ctagsOutput, _, err := builder.RunCTags(target, ctx.BuildProperties)
+	ctagsOutput, _, err := preprocessor.RunCTags(target, ctx.BuildProperties)
 	NoError(t, err)
 
 	return ctagsOutput