Better check for valid c# identifier, (#112)

fixes net-daemon/netdaemon #111 Co-authored-by: John Vert <john@groopit.co>
net-daemon · May 6, 2020 · 0d421d9 · 0d421d9
1 parent 45edbcf
commit 0d421d9
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/DaemonRunner/DaemonRunner/Service/App/CodeGenerator.cs b/src/DaemonRunner/DaemonRunner/Service/App/CodeGenerator.cs
@@ -82,9 +82,12 @@ public class CodeGenerator
                     {
                         var (fluent, fluentInterface) = _FluentApiMapper[domain];
                         var name = entity[(entity.IndexOf(".") + 1)..];
-                        // Make sure the name is valid
-                        if (long.TryParse(name, out _))
+                        // Quick check to make sure the name is a valid C# identifier. Should really check to make
+                        // sure it doesn't collide with a reserved keyword as well.
+                        if (!char.IsLetter(name[0]) && (name[0] != '_'))
+                        {
                             name = "e_" + name;
+                        }
 
                         var propertyCode = $@"public {fluentInterface} {name.ToCamelCase()} => _app.{fluent}(""{entity}"");";
                         var propDeclaration = CSharpSyntaxTree.ParseText(propertyCode).GetRoot().ChildNodes().OfType<PropertyDeclarationSyntax>().FirstOrDefault();