From de4edf25e1a7d9e3d90b6013513d48281afab0cc Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Thu, 19 Nov 2026 23:42:08 +0000 Subject: [PATCH 1/2] Initial plan From 939435b618a519559a6b94c0feec3fcc9ff07ac1 Mon Sep 17 00:00:00 2001 From: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> Date: Thu, 19 Nov 2026 23:48:11 +0000 Subject: [PATCH 2/2] fix(csharp): Pascal-case extensible enum members Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .../src/Providers/EnumProvider.cs | 5 ++++- .../src/Providers/ExtensibleEnumProvider.cs | 16 +++++++++++++- .../EnumProviders/EnumProviderTests.cs | 21 +++++++++++-------- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs index 74e1679a7b2..64c1453d3e7 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/EnumProvider.cs @@ -159,7 +159,7 @@ private protected string[] GetGeneratedValueNames( continue; } - var normalizedName = name.NormalizeCSharpAcronyms(); + var normalizedName = NormalizeValueName(inputValues[i].Name, name); normalizedNames[i] = lastContractNames.Contains(name, StringComparer.Ordinal) && !IsCustomizedValueName(normalizedName) ? name : normalizedName; @@ -167,6 +167,9 @@ private protected string[] GetGeneratedValueNames( return normalizedNames; } + private protected virtual string NormalizeValueName(string inputName, string generatedName) => + generatedName.NormalizeCSharpAcronyms(); + private protected virtual bool IsCustomizedValueName(string name) => GetMemberSuppressionAttributes().Any(a => a.ConstructorArguments.Length > 0 && a.ConstructorArguments[0].Value is string suppressedName && suppressedName == name); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs index b60ded0dfc7..cd8b7639218 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ExtensibleEnumProvider.cs @@ -7,6 +7,7 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Linq; +using System.Text.RegularExpressions; using Microsoft.TypeSpec.Generator.EmitterRpc; using Microsoft.TypeSpec.Generator.Expressions; using Microsoft.TypeSpec.Generator.Input; @@ -19,7 +20,7 @@ namespace Microsoft.TypeSpec.Generator.Providers { - public class ExtensibleEnumProvider : EnumProvider + public partial class ExtensibleEnumProvider : EnumProvider { private readonly IReadOnlyList _allowedValues; private readonly TypeSignatureModifiers _modifiers; @@ -43,6 +44,19 @@ internal ExtensibleEnumProvider(InputEnumType input, TypeProvider? declaringType private readonly FieldProvider _valueField; + private protected override string NormalizeValueName(string inputName, string generatedName) + { + // Use the input name to find words before ToIdentifierName removes separators. + var name = UppercaseWords().Replace(inputName, static match => match.Value[..1] + match.Value[1..].ToLowerInvariant()); + return base.NormalizeValueName(inputName, name == inputName ? generatedName : name.ToIdentifierName().NormalizeCSharpUrlSuffix()); + } + + [GeneratedRegex(""" + (? typeof(string)); @@ -1330,7 +1333,7 @@ public void BuildEnumType_ExtensibleStringEnum_IsExactNameValuePreserved() enumValues, isExtensible: true); enumValues.Add(InputFactory.EnumMember.String("One", "1", enumType)); - enumValues.Add(InputFactory.EnumMember.String("snake_case_value", "2", enumType, isExactName: true)); + enumValues.Add(InputFactory.EnumMember.String(name, name, enumType, isExactName: isExactName)); var enumProvider = EnumProvider.Create(enumType); var fields = enumProvider.Fields; @@ -1340,12 +1343,12 @@ public void BuildEnumType_ExtensibleStringEnum_IsExactNameValuePreserved() Assert.AreEqual(3, fields.Count); Assert.AreEqual("_value", fields[0].Name); Assert.AreEqual("OneValue", fields[1].Name); - // exact-name value: name preserved verbatim, with the `Value` suffix appended - Assert.AreEqual("snake_case_valueValue", fields[2].Name); + Assert.AreEqual(expectedName + "Value", fields[2].Name); + Assert.AreEqual(name, ((LiteralExpression)fields[2].InitializationValue!).Literal); Assert.AreEqual(2, properties.Count); Assert.AreEqual("One", properties[0].Name); - Assert.AreEqual("snake_case_value", properties[1].Name); + Assert.AreEqual(expectedName, properties[1].Name); } [TestCase(false, "CallbackUrl", false, "CallbackUri")]