use MergeSketchSources instead of the command

Author: masci

Diff for: 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)
 	}

Diff for: legacy/builder/test/sketch_source_merger_test.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
 }