Merge pull request #53 from srikrsna/consistently-sort-tags

sort tags in consistent order

module/replace.go

@@ -3,6 +3,7 @@ package module
 import (
 	"go/ast"
 	"go/token"
+	"sort"
 	"strings"
 
 	"github.com/fatih/structtag"
@@ -95,6 +96,7 @@ func (v retag) Visit(n ast.Node) ast.Visitor {
 			return nil
 		}
 
+		sort.Stable(newTags) // sort tags according to keys
 		for _, t := range newTags.Tags() {
 			oldTags.Set(t)
 		}

module/replace_test.go

@@ -29,7 +29,7 @@ func TestRetag(t *testing.T) {
 	module.Retag(n, map[string]map[string]*structtag.Tags{
 		"Simple": {
 			"Single":   tagMust(structtag.Parse(`sql:"-,omitempty"`)),
-			"Multiple": tagMust(structtag.Parse(`xml:"-,omitempty"`)),
+			"Multiple": tagMust(structtag.Parse(`xml:"-,omitempty" sql:"ke,op" bson:"ke,op"`)),
 			"None":     tagMust(structtag.Parse(`json:"none,omitempty"`)),
 		},
 	})

module/tagger.go

@@ -32,7 +32,6 @@ func (mod) Name() string {
 }
 
 func (m mod) Execute(targets map[string]pgs.File, packages map[string]pgs.Package) []pgs.Artifact {
-
 	xtv := m.Parameters().Str("xxx")
 
 	xtv = strings.Replace(xtv, "+", ":", -1)

module/test/golden.txt

@@ -2,6 +2,6 @@ package main
 
 type Simple struct {
 	Single		string	`json:"key,option" sql:"-,omitempty"`
-	Multiple	*string	`json:"ke,op" xml:"-,omitempty"`
+	Multiple	*string	`json:"ke,op" xml:"-,omitempty" bson:"ke,op" sql:"ke,op"`
 	None		int32	`json:"none,omitempty"`
 }