fix: don't change the service name early (#268)

cloudwego · Sep 19, 2024 · 8402807 · 8402807
1 parent 196fe4c
commit 8402807
Show file tree

Hide file tree

Showing 5 changed files with 2,942 additions and 572 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.18"
+version = "0.11.19"
 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
@@ -226,12 +226,8 @@ impl ThriftLower {
             result.push(self.mk_item(kind, tags.into()));
 
             if !exception.is_empty() {
-                let name: Ident = format!(
-                    "{}{}Exception",
-                    service.name.to_upper_camel_case().as_str(),
-                    method_name
-                )
-                .into();
+                let name: Ident =
+                    format!("{}{}Exception", service.name.as_str(), method_name).into();
                 let kind = ir::ItemKind::Enum(ir::Enum {
                     name: name.clone(),
                     variants: exception,
@@ -243,12 +239,7 @@ impl ThriftLower {
                 result.push(self.mk_item(kind, tags.into()));
             }
 
-            let name: Ident = format!(
-                "{}{}ArgsSend",
-                service.name.to_upper_camel_case().as_str(),
-                method_name
-            )
-            .into();
+            let name: Ident = format!("{}{}ArgsSend", service.name.as_str(), method_name).into();
             let kind = ir::ItemKind::Message(ir::Message {
                 name: name.clone(),
                 fields: f.arguments.iter().map(|a| self.lower_field(a)).collect(),
@@ -258,12 +249,7 @@ impl ThriftLower {
             tags.insert(crate::tags::KeepUnknownFields(false));
             result.push(self.mk_item(kind, tags.into()));
 
-            let name: Ident = format!(
-                "{}{}ArgsRecv",
-                service.name.to_upper_camel_case().as_str(),
-                method_name
-            )
-            .into();
+            let name: Ident = format!("{}{}ArgsRecv", service.name.as_str(), method_name).into();
             let kind = ir::ItemKind::Message(ir::Message {
                 name: name.clone(),
                 fields: f