Skip to content

Commit

Permalink
use MergeSketchSources instead of the command
Browse files Browse the repository at this point in the history
  • Loading branch information
masci committed Jul 8, 2019
1 parent 4a23cd0 commit 1e04528
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 63 deletions.
4 changes: 4 additions & 0 deletions legacy/builder/container_merge_copy_sketch_files.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
63 changes: 0 additions & 63 deletions legacy/builder/test/sketch_source_merger_test.go

This file was deleted.

26 changes: 26 additions & 0 deletions legacy/builder/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 1e04528

Please sign in to comment.