Merge pull request #35 from bonsai-rx/casing-rules

Keep leading underscores in generated identifiers
bonsai-rx · Jan 22, 2024 · 9ad689f · 9ad689f
2 parents c099340 + 3fd2c50
commit 9ad689f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/Bonsai.Sgen.Tests/EnumGenerationTests.cs b/Bonsai.Sgen.Tests/EnumGenerationTests.cs
@@ -36,6 +36,33 @@ public void GenerateIntegerEnum_SerializerAnnotationsUseIntegerValues()
             Assert.IsTrue(code.Contains("YamlMemberAttribute(Alias=\"0\")"));
         }
 
+        [TestMethod]
+        public async Task GenerateIntegerEnumWithRawLiterals_EnumTypeUseValidIdentifiers()
+        {
+            var schema = await JsonSchema.FromJsonAsync(@"
+{
+    ""$schema"": ""http://json-schema.org/draft-04/schema#"",
+    ""type"": ""object"",
+    ""title"": ""Container"",
+    ""additionalProperties"": false,
+    ""properties"": {
+      ""Enum"": {
+         ""$ref"": ""#/definitions/IntEnum""
+      }
+    },
+    ""definitions"": {
+      ""IntEnum"": {
+         ""enum"": [ 0, 1, 2 ],
+         ""type"": ""integer""
+      }
+    }
+  }
+");
+            var generator = TestHelper.CreateGenerator(schema);
+            var code = generator.GenerateFile();
+            CompilerTestHelper.CompileFromSource(code);
+        }
+
         [TestMethod]
         public void GenerateStringEnum_SerializerAnnotationsUseStringValues()
         {

diff --git a/Bonsai.Sgen/CSharpNamingConvention.cs b/Bonsai.Sgen/CSharpNamingConvention.cs
@@ -13,7 +13,9 @@ private CSharpNamingConvention()
 
         public string Apply(string value)
         {
-            return PascalCaseNamingConvention.Instance.Apply(value).Replace("_", string.Empty);
+            var result = PascalCaseNamingConvention.Instance.Apply(value);
+            var prefix = result.StartsWith('_') ? "_" : string.Empty;
+            return prefix + result.Replace("_", string.Empty);
         }
     }
 }