use MergeSketchSources instead of the command

legacy/builder/container_merge_copy_sketch_files.go

@@ -39,6 +39,10 @@ import (
 type ContainerMergeCopySketchFiles struct{}
 
 func (s *ContainerMergeCopySketchFiles) Run(ctx *types.Context) error {
+	offset, source := bldr.MergeSketchSources(types.SketchFromLegacy(ctx.Sketch))
+	ctx.LineOffset = offset
+	ctx.Source = source
+
 	if err := new(SketchSourceMerger).Run(ctx); err != nil {
 		return i18n.WrapError(err)
 	}

legacy/builder/test/sketch_source_merger_test.go

-/*
- * This file is part of Arduino Builder.
- *
- * Arduino Builder is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction.  Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License.  This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- *
- * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
- * Copyright 2015 Matthijs Kooijman
- */
-
-package test
-
-import (
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/arduino/arduino-cli/legacy/builder"
-	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/go-paths-helper"
-	"github.com/stretchr/testify/require"
-)
-
-func TestMergeSketch(t *testing.T) {
-	ctx := &types.Context{
-		SketchLocation: paths.New("sketch1", "sketch.ino"),
-	}
-
-	commands := []types.Command{
-		&builder.SketchLoader{},
-		&builder.SketchSourceMerger{},
-	}
-
-	for _, command := range commands {
-		err := command.Run(ctx)
-		NoError(t, err)
-	}
-
-	source := ctx.Source
-
-	expected_source := LoadAndInterpolate(t, filepath.Join("sketch1", "merged_sketch.txt"), ctx)
-	require.Equal(t, expected_source, strings.Replace(source, "\r\n", "\n", -1))
-}

legacy/builder/types/types.go

@@ -148,6 +148,32 @@ func SketchToLegacy(sketch *sketch.Sketch) *Sketch {
 	return s
 }
 
+func SketchFromLegacy(s *Sketch) *sketch.Sketch {
+	others := []*sketch.Item{}
+	for _, f := range s.OtherSketchFiles {
+		if i, err := sketch.NewItem(f.Name.String()); err == nil {
+			others = append(others, i)
+		}
+	}
+
+	additional := []*sketch.Item{}
+	for _, f := range s.AdditionalFiles {
+		if i, err := sketch.NewItem(f.Name.String()); err == nil {
+			additional = append(additional, i)
+		}
+	}
+
+	return &sketch.Sketch{
+		MainFile: &sketch.Item{
+			Path:   s.MainFile.Name.String(),
+			Source: []byte(s.MainFile.Source),
+		},
+		LocationPath:     s.MainFile.Name.Parent().String(),
+		OtherSketchFiles: others,
+		AdditionalFiles:  additional,
+	}
+}
+
 type PlatforKeysRewrite struct {
 	Rewrites []PlatforKeyRewrite
 }