removed SketchSourceMerger

Author: masci

Diff for: legacy/builder/container_merge_copy_sketch_files.go

@@ -39,14 +39,14 @@ import (
 type ContainerMergeCopySketchFiles struct{}
 
 func (s *ContainerMergeCopySketchFiles) Run(ctx *types.Context) error {
-	offset, source := bldr.MergeSketchSources(types.SketchFromLegacy(ctx.Sketch))
+	sk := types.SketchFromLegacy(ctx.Sketch)
+	if sk == nil {
+		return i18n.WrapError("unable to convert legacy sketch to the new type")
+	}
+	offset, source := bldr.MergeSketchSources(sk)
 	ctx.LineOffset = offset
 	ctx.Source = source
 
-	if err := new(SketchSourceMerger).Run(ctx); err != nil {
-		return i18n.WrapError(err)
-	}
-
 	if err := bldr.SaveSketchItemCpp(&sketch.Item{ctx.Sketch.MainFile.Name.String(), []byte(ctx.Source)}, ctx.SketchBuildPath.String()); err != nil {
 		return i18n.WrapError(err)
 	}