Skip to content

Commit dbf8930

Browse files
committed
Change enum vendor suffix identification to consistently always use the managed name
I already made the change in ProcessAndGetNewAttributes in a previous PR, but apparently didn't do the same for the VisitEnumDeclaration method.
1 parent dde45c7 commit dbf8930

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2180,7 +2180,7 @@ public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node)
21802180
var groupInfo = job.Groups.GetValueOrDefault(managedTypeName);
21812181

21822182
var typeVendor = job.Vendors.FirstOrDefault(s =>
2183-
nativeTypeName.EndsWith(s, vendorSuffixComparison)
2183+
managedTypeName.EndsWith(s, vendorSuffixComparison)
21842184
);
21852185
var hasTypeSuffix = typeVendor != null;
21862186
var vendorAffixType = NameAffixes.KhronosVendor;
@@ -2245,7 +2245,7 @@ public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node)
22452245
node.AttributeLists.AddNameAffix(
22462246
NameAffixType.Suffix,
22472247
vendorAffixType,
2248-
nativeTypeName[^typeVendor.Length..],
2248+
managedTypeName[^typeVendor.Length..],
22492249
true
22502250
)
22512251
);
@@ -2254,7 +2254,7 @@ public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node)
22542254
// Check if the enum contains unsuffixed members
22552255
var containsUnsuffixedMembers = node.Members.Any(member =>
22562256
{
2257-
var memberName = member.AttributeLists.GetNativeNameOrDefault(member.Identifier);
2257+
var memberName = member.Identifier.Text;
22582258
return !job.Vendors.Any(vendor =>
22592259
memberName.EndsWith(vendor, vendorSuffixComparison)
22602260
&& CanIdentifySuffix(memberName, vendor.Length)
@@ -2284,9 +2284,7 @@ public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node)
22842284
[
22852285
.. node.Members.Select(member =>
22862286
{
2287-
var memberName = member.AttributeLists.GetNativeNameOrDefault(
2288-
member.Identifier
2289-
);
2287+
var memberName = member.Identifier.Text;
22902288

22912289
if (
22922290
memberName.EndsWith(typeVendor, vendorSuffixComparison)

0 commit comments

Comments
 (0)