slight adjustment for consistency

mganss · Jun 7, 2022 · efef426 · efef426
1 parent 8f4769b
commit efef426
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/XmlSchemaClassGenerator/CodeUtilities.cs b/XmlSchemaClassGenerator/CodeUtilities.cs
@@ -174,8 +174,7 @@ public static string GetUniqueFieldName(this TypeModel typeModel, PropertyModel
  var classModel = typeModel as ClassModel;
  var propBackingFieldName = propertyModel.Name.ToBackingField(classModel?.Configuration.PrivateMemberPrefix);
 
- if (!CSharp.IsValidIdentifier(propBackingFieldName.ToLower()))
- propBackingFieldName = "@" + propBackingFieldName;
+ propBackingFieldName = CSharp.CreateEscapedIdentifier(propBackingFieldName);
 
  if (classModel == null)
  return propBackingFieldName;
@@ -257,8 +256,8 @@ public static bool IsUsingNamespace(string namespaceName, GeneratorConfiguration
 
  public static CodeTypeReference CreateTypeReference(Type type, GeneratorConfiguration conf)
  {
- // If the type is a keyword it will prefix it with an underscore to make it a valid identifier.
- var isKeyword = CSharp.CreateValidIdentifier(CSharp.GetTypeOutput(new(type)))[0] == '_';
+ // If the type is a keyword it will prefix it with an @ to make it a valid identifier.
+ var isKeyword = CSharp.CreateEscapedIdentifier(CSharp.GetTypeOutput(new(type)))[0] == '@';
  if (!isKeyword && IsUsingNamespace(type.Namespace, conf))
  {
  var typeRef = new CodeTypeReference(type.Name, conf.CodeTypeReferenceOptions);