Skip to content

fix generated method names #2224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 7, 2025
Merged

fix generated method names #2224

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7acfc9
fix generated method names when a method name uses uppercase characters
Skoti Apr 25, 2025
2d9c60b
generate wrapper functions with proper names
Skoti Apr 25, 2025
df9b141
use RPC in uppercase in function names
Skoti May 6, 2025
6d5ff3c
Merge branch 'release/1.x' into bugfix/method-name
glbrntt May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions Sources/protoc-gen-grpc-swift/Generator-Names.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,15 @@ extension Generator {
}

internal var methodMakeFunctionCallName: String {
let name: String
return "make\(methodComposableName)Call"
}

if self.options.keepMethodCasing {
name = self.method.name
} else {
name = NamingUtils.toUpperCamelCase(self.method.name)
internal var methodComposableName: String {
var name = method.name
if !options.keepMethodCasing {
name = name.prefix(1).uppercased() + name.dropFirst()
}

let fnName = "make\(name)Call"
return self.sanitize(fieldName: fnName)
return name
}

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

internal var methodInterceptorFactoryName: String {
return "make\(self.method.name)Interceptors"
return "make\(methodComposableName)Interceptors"
}

internal var servicePath: String {
Expand Down