Inlined function

Author: cmaglie

arduino/builder/preprocessor/arduino_preprocessor.go

@@ -21,7 +21,6 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/arduino/arduino-cli/arduino/builder"
 	"github.com/arduino/arduino-cli/arduino/sketch"
 	"github.com/arduino/arduino-cli/executils"
 	"github.com/arduino/arduino-cli/legacy/builder/utils"
@@ -84,6 +83,10 @@ func PreprocessSketchWithArduinoPreprocessor(sk *sketch.Sketch, buildPath *paths
 	}
 	result := utils.NormalizeUTF8(commandStdOut)
 
-	err = builder.SketchSaveItemCpp(sk.MainFile, result, buildPath.Join("sketch"))
+	destFile := buildPath.Join(sk.Name + ".ino.cpp")
+	if err := destFile.WriteFile(result); err != nil {
+		return normalOut.Bytes(), verboseOut.Bytes(), err
+	}
+
 	return normalOut.Bytes(), verboseOut.Bytes(), err
 }

arduino/builder/sketch.go

@@ -41,28 +41,22 @@ func (b *Builder) PrepareSketchBuildPath(sourceOverrides map[string]string, buil
 	if err := buildPath.MkdirAll(); err != nil {
 		return 0, errors.Wrap(err, tr("unable to create a folder to save the sketch"))
 	}
-	if offset, mergedSource, err := b.sketchMergeSources(sourceOverrides); err != nil {
-		return 0, err
-	} else if err := SketchSaveItemCpp(b.sketch.MainFile, []byte(mergedSource), buildPath); err != nil {
-		return 0, err
-	} else if err := sketchCopyAdditionalFiles(b.sketch, buildPath, sourceOverrides); err != nil {
+
+	offset, mergedSource, err := b.sketchMergeSources(sourceOverrides)
+	if err != nil {
 		return 0, err
-	} else {
-		return offset, nil
 	}
-}
 
-// SketchSaveItemCpp saves a preprocessed .cpp sketch file on disk
-func SketchSaveItemCpp(path *paths.Path, contents []byte, buildPath *paths.Path) error {
-	sketchName := path.Base()
-
-	destFile := buildPath.Join(fmt.Sprintf("%s.cpp", sketchName))
+	destFile := buildPath.Join(b.sketch.Name + ".ino.cpp")
+	if err := destFile.WriteFile([]byte(mergedSource)); err != nil {
+		return 0, err
+	}
 
-	if err := destFile.WriteFile(contents); err != nil {
-		return errors.Wrap(err, tr("unable to save the sketch on disk"))
+	if err := sketchCopyAdditionalFiles(b.sketch, buildPath, sourceOverrides); err != nil {
+		return 0, err
 	}
 
-	return nil
+	return offset, nil
 }
 
 // sketchMergeSources merges all the .ino source files included in a sketch to produce

arduino/builder/sketch_test.go

@@ -26,28 +26,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestSaveSketch(t *testing.T) {
-	sketchName := t.Name() + ".ino"                 // "TestSaveSketch.ino"
-	outName := sketchName + ".cpp"                  // "TestSaveSketch.ino.cpp"
-	sketchFile := paths.New("testdata", sketchName) // "testdata/TestSaveSketch.ino.cpp"
-	tmp, err := paths.MkTempDir("", "")
-	require.NoError(t, err)
-	defer tmp.RemoveAll()
-	source, err := sketchFile.ReadFile()
-	if err != nil {
-		t.Fatalf("unable to read golden file %s: %v", sketchFile, err)
-	}
-
-	SketchSaveItemCpp(paths.New(sketchName), source, tmp)
-
-	out, err := tmp.Join(outName).ReadFile()
-	if err != nil {
-		t.Fatalf("unable to read output file %s: %v", outName, err)
-	}
-
-	require.Equal(t, source, out)
-}
-
 func TestMergeSketchSources(t *testing.T) {
 	// borrow the sketch from TestLoadSketchFolder to avoid boilerplate
 	sk, err := sketch.New(paths.New("testdata", "TestLoadSketchFolder"))