Skip to content

Commit f7acfc9

Browse files
committed
fix generated method names when a method name uses uppercase characters
1 parent d38e16b commit f7acfc9

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

Sources/protoc-gen-grpc-swift/Generator-Names.swift

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,15 @@ extension Generator {
128128
}
129129

130130
internal var methodMakeFunctionCallName: String {
131-
let name: String
131+
return "make\(methodComposableName)Call"
132+
}
132133

133-
if self.options.keepMethodCasing {
134-
name = self.method.name
135-
} else {
136-
name = NamingUtils.toUpperCamelCase(self.method.name)
134+
internal var methodComposableName: String {
135+
var name = method.name
136+
if !options.keepMethodCasing {
137+
name = name.prefix(1).uppercased() + name.dropFirst()
137138
}
138-
139-
let fnName = "make\(name)Call"
140-
return self.sanitize(fieldName: fnName)
139+
return name
141140
}
142141

143142
internal func sanitize(fieldName string: String) -> String {
@@ -156,7 +155,7 @@ extension Generator {
156155
}
157156

158157
internal var methodInterceptorFactoryName: String {
159-
return "make\(self.method.name)Interceptors"
158+
return "make\(methodComposableName)Interceptors"
160159
}
161160

162161
internal var servicePath: String {

0 commit comments

Comments
 (0)