fix C# and Go identifier and member name collisions

crates/cpp/src/lib.rs

@@ -2249,7 +2249,10 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for CppInterfaceGenerator<'a>
             let mut all_types = String::new();
             for case in variant.cases.iter() {
                 Self::docs(&mut self.r#gen.h_src.src, &case.docs);
-                let case_pascal = to_c_ident(&case.name).to_pascal_case();
+                let mut case_pascal = to_c_ident(&case.name).to_pascal_case();
+                if case_pascal == pascal {
+                    case_pascal.push('_');
+                }
                 if !all_types.is_empty() {
                     all_types += ", ";
                 }
@@ -3167,14 +3170,23 @@ impl<'a, 'b> Bindgen for FunctionBindgen<'a, 'b> {
                     self.r#gen
                         .type_name(&Type::Id(*var_ty), &self.namespace, Flavor::InStruct);
 
+                let var_pascal = self.r#gen.resolve.types[*var_ty]
+                    .name
+                    .as_ref()
+                    .unwrap()
+                    .to_pascal_case();
+
                 uwriteln!(self.src, "switch ((int32_t) {}) {{", expr_to_match);
                 for (i, ((case, (block, block_results)), payload)) in
                     variant.cases.iter().zip(blocks).zip(payloads).enumerate()
                 {
                     uwriteln!(self.src, "case {}: {{", i);
                     if case.ty.is_some() {
-                        let case =
-                            format!("{elem_ns}::{}", to_c_ident(&case.name).to_pascal_case());
+                        let mut case_pascal = to_c_ident(&case.name).to_pascal_case();
+                        if case_pascal == var_pascal {
+                            case_pascal.push('_');
+                        }
+                        let case = format!("{elem_ns}::{case_pascal}");
                         uwriteln!(
                             self.src,
                             "auto& {} = std::get<{case}>({}.variants).value;",
@@ -3198,6 +3210,11 @@ impl<'a, 'b> Bindgen for FunctionBindgen<'a, 'b> {
                     .drain(self.blocks.len() - variant.cases.len()..)
                     .collect::<Vec<_>>();
 
+                let var_pascal = self.r#gen.resolve.types[*ty]
+                    .name
+                    .as_ref()
+                    .unwrap()
+                    .to_pascal_case();
                 let ty = self
                     .r#gen
                     .type_name(&Type::Id(*ty), &self.namespace, Flavor::InStruct);
@@ -3213,7 +3230,10 @@ impl<'a, 'b> Bindgen for FunctionBindgen<'a, 'b> {
                 for (i, (case, (block, block_results))) in
                     variant.cases.iter().zip(blocks).enumerate()
                 {
-                    let tp = to_c_ident(&case.name).to_pascal_case();
+                    let mut tp = to_c_ident(&case.name).to_pascal_case();
+                    if tp == var_pascal {
+                        tp.push('_');
+                    }
                     uwriteln!(self.src, "case {i}: {{ {block}");
                     uwriteln!(
                         self.src,

crates/csharp/Cargo.toml

@@ -16,7 +16,6 @@ workspace = true
 
 [lib]
 doctest = false
-test = false
 
 [dependencies]
 wit-bindgen-core = { workspace = true }

crates/csharp/src/csharp_ident.rs

@@ -92,20 +92,22 @@ impl ToCSharpIdent for str {
     }
 
     fn to_csharp_ident(&self) -> String {
+        let ident = self.to_lower_camel_case();
         // Escape C# keywords
-        if Self::csharp_keywords().contains(&self) {
-            format!("@{self}")
+        if Self::csharp_keywords().contains(&ident.as_str()) {
+            format!("@{ident}")
         } else {
-            self.to_lower_camel_case()
+            ident
         }
     }
 
     fn to_csharp_ident_upper(&self) -> String {
+        let ident = self.to_upper_camel_case();
         // Escape C# keywords
-        if Self::csharp_keywords().contains(&self) {
-            format!("@{self}")
+        if Self::csharp_keywords().contains(&ident.as_str()) {
+            format!("@{ident}")
         } else {
-            self.to_upper_camel_case()
+            ident
         }
     }
 }