Merge pull request #96 from arp242/underscoritus

Don't double up underscores with -transform=snakecase

main.go

@@ -391,6 +391,10 @@ func (c *config) addTags(fieldName string, tags *structtag.Tags) (*structtag.Tag
 	case "snakecase":
 		var lowerSplitted []string
 		for _, s := range splitted {
+			s = strings.Trim(s, "_")
+			if s == "" {
+				continue
+			}
 			lowerSplitted = append(lowerSplitted, strings.ToLower(s))
 		}
 

main_test.go

@@ -32,6 +32,15 @@ func TestRewrite(t *testing.T) {
 				transform:  "snakecase",
 			},
 		},
+		{
+			file: "struct_add_underscore",
+			cfg: &config{
+				add:        []string{"json"},
+				output:     "source",
+				structName: "foo",
+				transform:  "snakecase",
+			},
+		},
 		{
 			file: "struct_add_existing",
 			cfg: &config{

test-fixtures/struct_add_underscore.golden

@@ -0,0 +1,5 @@
+package foo
+
+type foo struct {
+	foo_bar string `json:"foo_bar"`
+}

test-fixtures/struct_add_underscore.input

@@ -0,0 +1,5 @@
+package foo
+
+type foo struct {
+	foo_bar string
+}