Merge pull request 99designs#591 from 99designs/fix-577

Fix mixed case name handling in ToGo, ToGoPrivate

codegen/templates/templates.go

@@ -235,7 +235,11 @@ func ToGo(name string) string {
 		if info.MatchCommonInitial {
 			word = strings.ToUpper(word)
 		} else if !info.HasCommonInitial {
-			word = ucFirst(strings.ToLower(word))
+			if strings.ToUpper(word) == word || strings.ToLower(word) == word {
+				// FOO or foo → Foo
+				// FOo → FOo
+				word = ucFirst(strings.ToLower(word))
+			}
 		}
 		runes = append(runes, []rune(word)...)
 	})
@@ -250,7 +254,13 @@ func ToGoPrivate(name string) string {
 	wordWalker(name, func(info *wordInfo) {
 		word := info.Word
 		if first {
-			word = strings.ToLower(info.Word)
+			if strings.ToUpper(word) == word || strings.ToLower(word) == word {
+				// ID → id, CAMEL → camel
+				word = strings.ToLower(info.Word)
+			} else {
+				// ITicket → iTicket
+				word = lcFirst(info.Word)
+			}
 			first = false
 		} else if info.MatchCommonInitial {
 			word = strings.ToUpper(word)

codegen/templates/templates_test.go

@@ -29,6 +29,8 @@ func TestToGo(t *testing.T) {
 	require.Equal(t, "", ToGo(""))
 
 	require.Equal(t, "RelatedUrls", ToGo("RelatedUrls"))
+	require.Equal(t, "ITicket", ToGo("ITicket"))
+	require.Equal(t, "FooTicket", ToGo("fooTicket"))
 }
 
 func TestToGoPrivate(t *testing.T) {
@@ -48,6 +50,9 @@ func TestToGoPrivate(t *testing.T) {
 	require.Equal(t, "utf8Foo", ToGoPrivate("UTF8Foo"))
 	require.Equal(t, "jsonEncoding", ToGoPrivate("JSONEncoding"))
 
+	require.Equal(t, "relatedUrls", ToGoPrivate("RelatedUrls"))
+	require.Equal(t, "iTicket", ToGoPrivate("ITicket"))
+
 	require.Equal(t, "rangeArg", ToGoPrivate("Range"))
 
 	require.Equal(t, "a", ToGoPrivate("A"))
@@ -87,6 +92,7 @@ func Test_wordWalker(t *testing.T) {
 	require.Equal(t, []*wordInfo{}, helper(""))
 
 	require.Equal(t, []*wordInfo{{Word: "Related"}, {Word: "Urls"}}, helper("RelatedUrls"))
+	require.Equal(t, []*wordInfo{{Word: "ITicket"}}, helper("ITicket"))
 }
 
 func TestCenter(t *testing.T) {