fix: add missing pilota_name convert (#257)

cloudwego · Jun 24, 2024 · d4be29a · d4be29a
1 parent b4b8f7a
commit d4be29a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pilota-build/Cargo.toml b/pilota-build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pilota-build"
-version = "0.11.10"
+version = "0.11.11"
 edition = "2021"
 description = "Compile thrift and protobuf idl into rust code at compile-time."
 documentation = "https://docs.rs/pilota-build"

diff --git a/pilota-build/src/parser/thrift/mod.rs b/pilota-build/src/parser/thrift/mod.rs
@@ -136,11 +136,13 @@ impl ThriftLower {
 
         let mut seen = FxHashSet::default();
         let mut duplicate_function_names = FxHashSet::default();
-        for name in service
-            .functions
-            .iter()
-            .map(|f| f.name.to_upper_camel_case())
-        {
+        for name in service.functions.iter().map(|f| {
+            self.extract_tags(&f.annotations)
+                .get::<PilotaName>()
+                .map(|name| &*name.0)
+                .unwrap_or_else(|| &*f.name)
+                .to_upper_camel_case()
+        }) {
             if !seen.insert(name.clone()) {
                 duplicate_function_names.insert(name);
             }
@@ -172,7 +174,7 @@ impl ThriftLower {
 
             let method_name = tags
                 .get::<PilotaName>()
-                .map(|name| name.0.to_string())
+                .map(|name| name.0.to_upper_camel_case())
                 .unwrap_or_else(|| {
                     let method_name = f.name.to_upper_camel_case();
                     if duplicate_function_names.contains(&method_name) {