Add AttributeUtils.GetNativeNameOrDefault()

Author: Exanite

sources/SilkTouch/SilkTouch/Mods/Common/AttributeUtils.cs

@@ -227,6 +227,38 @@ private static SyntaxList<AttributeListSyntax> AddNamePrefixOrSuffix(this IEnume
         ];
     }
 
+    /// <summary>
+    /// Gets the native name or returns the specified default.
+    /// </summary>
+    /// <remarks>
+    /// The default usually should be the node's identifier.
+    /// </remarks>
+    public static string GetNativeNameOrDefault(this IEnumerable<AttributeListSyntax> attributeLists, SyntaxToken identifier)
+    {
+        if (TryGetNativeName(attributeLists, out var nativeName))
+        {
+            return nativeName;
+        }
+
+        return identifier.ToString();
+    }
+
+    /// <summary>
+    /// Gets the native name or returns the specified default.
+    /// </summary>
+    /// <remarks>
+    /// The default usually should be the node's identifier.
+    /// </remarks>
+    public static string GetNativeNameOrDefault(this IEnumerable<AttributeListSyntax> attributeLists, string defaultName)
+    {
+        if (TryGetNativeName(attributeLists, out var nativeName))
+        {
+            return nativeName;
+        }
+
+        return defaultName;
+    }
+
     /// <summary>
     /// Gets the value of the native name attribute from the given attribute list.
     /// </summary>

sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs

@@ -2041,7 +2041,7 @@ private class RewriterPhase3(HashSet<string> vendors, HashSet<string> excludedId
     {
         private SyntaxList<AttributeListSyntax> ProcessAndGetNewAttributes(SyntaxList<AttributeListSyntax> attributeLists, SyntaxToken identifier)
         {
-            var name = attributeLists.TryGetNativeName(out var nativeName) ? nativeName : identifier.Text;
+            var name = attributeLists.GetNativeNameOrDefault(identifier);
 
             var handleSuffix = "_T";
             if (name.EndsWith(handleSuffix))