Proper case for function arguments (lowercase first letter)

alecthomas · Oct 29, 2013 · 2a05ca7 · 2a05ca7
1 parent f466689
commit 2a05ca7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/generator/go.go b/generator/go.go
@@ -170,7 +170,7 @@ func (g *GoGenerator) formatField(field *parser.Field) string {
 func (g *GoGenerator) formatArguments(arguments []*parser.Field) string {
 	args := make([]string, len(arguments))
 	for i, arg := range arguments {
-		args[i] = fmt.Sprintf("%s %s", camelCase(arg.Name), g.formatType(g.pkg, g.thrift, arg.Type, arg.Optional))
+		args[i] = fmt.Sprintf("%s %s", lowerCamelCase(arg.Name), g.formatType(g.pkg, g.thrift, arg.Type, arg.Optional))
 	}
 	return strings.Join(args, ", ")
 }

diff --git a/generator/main.go b/generator/main.go
@@ -25,13 +25,11 @@ func camelCase(st string) string {
 }
 
 func lowerCamelCase(st string) string {
-	// // Assume st is not unicode
-	// if strings.ToUpper(st) == st {
-	// 	return strings.ToLower(st)
-	// }
-	// st = thrift.CamelCase(st)
-	// return strings.ToLower(st[:1]) + st[1:]
-	return camelCase(st)
+	if len(st) <= 1 {
+		return strings.ToLower(st)
+	}
+	st = thrift.CamelCase(st)
+	return strings.ToLower(st[:1]) + st[1:]
 }
 
 // Converts a string to a valid Golang identifier, as defined in