fix: detect identifiers in comments using regex, not strings.Fields

parse/parse.go

@@ -10,6 +10,7 @@ import (
 	"go/token"
 	"io"
 	"os"
+	"regexp"
 	"strings"
 	"unicode"
 
@@ -55,11 +56,11 @@ func subIntoLiteral(lit, typeTemplate, specificType string) string {
 }
 
 func subTypeIntoComment(line, typeTemplate, specificType string) string {
-	var subbed string
-	for _, w := range strings.Fields(line) {
-		subbed = subbed + subIntoLiteral(w, typeTemplate, specificType) + " "
+	re := regexp.MustCompile(`[a-zA-Z_][a-zA-Z0-9_]*`)
+	f := func(lit string) string {
+		return subIntoLiteral(lit, typeTemplate, specificType)
 	}
-	return subbed
+	return re.ReplaceAllStringFunc(line, f)
 }
 
 // Does the heavy lifting of taking a line of our code and

parse/parse_test.go

@@ -110,6 +110,12 @@ var tests = []struct {
 		types:       []map[string]string{{"SomeThing": "string"}},
 		expectedOut: `test/bugreports/negation_string.go`,
 	},
+	{
+		filename:    "generic_comment.go",
+		in:          `test/bugreports/comment_generic.go`,
+		types:       []map[string]string{{"SomeThing": "int"}},
+		expectedOut: `test/bugreports/comment_int.go`,
+	},
 }
 
 func TestParse(t *testing.T) {

parse/test/bugreports/comment_generic.go

@@ -0,0 +1,8 @@
+package bugreports
+
+import "github.com/cheekybits/genny/generic"
+
+type SomeThing generic.Type
+
+// foo=SomeThing,OtherThing
+func foo(x SomeThing) {}

parse/test/bugreports/comment_int.go

@@ -0,0 +1,8 @@
+// This file was automatically generated by genny.
+// Any changes will be lost if this file is regenerated.
+// see https://github.com/cheekybits/genny
+
+package bugreports
+
+// foo=int,OtherThing
+func foo(x int) {}