Skip to content

Commit 412b948

Browse files
committed
Another emergency patch for Unique source gen. Considering unit testing for future features.
1 parent 143da39 commit 412b948

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

EnumSourceGenerator/EnumGenerator.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ private static IEnumerable<string> ExtractFromCollection(
144144
{
145145
var firstArgument = objectCreation.ArgumentList?.Arguments.FirstOrDefault();
146146
if (firstArgument?.Expression is LiteralExpressionSyntax literal)
147-
yield return SanitizeEnumName(literal.Token.ValueText);
147+
yield return literal.Token.ValueText;
148148
}
149149
// Handle shorthand object initializers like `new("...")`
150150
else if (objectExpression.Expression is ImplicitObjectCreationExpressionSyntax implicitCreation)
151151
{
152152
var firstArgument = implicitCreation.ArgumentList?.Arguments.FirstOrDefault();
153153
if (firstArgument?.Expression is LiteralExpressionSyntax literal)
154-
yield return SanitizeEnumName(literal.Token.ValueText);
154+
yield return literal.Token.ValueText;
155155
}
156156
}
157157
}
@@ -176,21 +176,22 @@ private static IEnumerable<string> ExtractFromArrayInitializer(
176176
{
177177
var firstArgument = objectCreation.ArgumentList?.Arguments.FirstOrDefault();
178178
if (firstArgument?.Expression is LiteralExpressionSyntax literal)
179-
yield return SanitizeEnumName(literal.Token.ValueText);
179+
yield return literal.Token.ValueText;
180180
}
181181
// Handle shorthand object initializers like `new("...")`
182182
else if (expression is ImplicitObjectCreationExpressionSyntax implicitCreation)
183183
{
184184
var firstArgument = implicitCreation.ArgumentList?.Arguments.FirstOrDefault();
185185
if (firstArgument?.Expression is LiteralExpressionSyntax literal)
186-
yield return SanitizeEnumName(literal.Token.ValueText);
186+
yield return literal.Token.ValueText;
187187
}
188188
}
189189
}
190190

191191
private static string GenerateEnumSource(string className, ImmutableArray<string> enumMembers)
192192
{
193-
var membersSource = string.Join(",\n", enumMembers.Select(m => $" {m}"));
193+
var sanitizedNames = enumMembers.Select(SanitizeEnumName).ToArray();
194+
var membersSource = string.Join(",\n", sanitizedNames.Select(m => $" {m}"));
194195
return $@"// Auto-generated code
195196
namespace ContentEnums
196197
{{
@@ -210,7 +211,8 @@ private static string GeneratePartialHelper(
210211
bool uniqueStruct,
211212
bool structReadonly)
212213
{
213-
var membersSource = string.Join(";\n", enumMembers.Select((m, i) => $" public {typeArgument} {m} => All[{i}]"));
214+
var sanitizedNames = enumMembers.Select(SanitizeEnumName).ToArray();
215+
var membersSource = string.Join(";\n", sanitizedNames.Select((m, i) => $" public {typeArgument} {m} => All[{i}]"));
214216
var structSource = string.Empty;
215217
if (uniqueStruct)
216218
{

SimpleInjection/SimpleInjection.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1010
<PackageId>SimpleInjection</PackageId>
11-
<Version>0.9.8.1</Version>
11+
<Version>0.9.8.2</Version>
1212
<Authors>Derek Gooding</Authors>
1313
<Company>Derek Gooding</Company>
1414
<Description>

0 commit comments

Comments
 (0)