Reorder code

Doesn't seem to affect OpenGL bindings generation

This is to ensure all trimming code happens after rewinding, which is useful because I'm thinking of refactoring this code and want to ensure that I can treat all of the trimming code equally.

Author: Exanite

sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs

@@ -1131,6 +1131,46 @@ ref string? identifiedPrefix
             );
         }
 
+        // Sometimes we get a little overzealous, so let's unwind back to just the GL_ being snipped
+        var rewind = false;
+        if (container is not null && job.Groups.ContainsKey(container))
+        {
+            foreach (var (_, (current, previous)) in names)
+            {
+                var prev = previous?.FirstOrDefault();
+                if (
+                    prev is not null
+                    && current.AsSpan().Count('_') - prev.AsSpan().Count('_') <= 1
+                    && (current.Length <= 4 || (job.Vendors?.Contains(current) ?? false))
+                )
+                {
+                    rewind = true;
+
+                    break;
+                }
+            }
+        }
+
+        if (rewind)
+        {
+            foreach (var (original, (current, previous)) in names)
+            {
+                var prev = previous?.FirstOrDefault() ?? original;
+                var prevList = previous ?? [];
+                var next = prev[(prev.IndexOf('_') + 1)..];
+                if (next == prev)
+                {
+                    prevList.Remove(prev);
+                }
+                else if (!prevList.Contains(prev))
+                {
+                    prevList.Add(prev);
+                }
+
+                names[original] = (prev[(prev.IndexOf('_') + 1)..], prevList);
+            }
+        }
+
         // OpenGL has a problem where an enum starts out as ARB but never gets promoted, and then contains other vendor
         // enums or even core enums. This removes the vendor suffix where it is not necessary e.g. BufferUsageARB
         // becomes BufferUsage.
@@ -1183,46 +1223,6 @@ vendorSuffix is null
             }
         }
 
-        // Sometimes we get a little overzealous, so let's unwind back to just the GL_ being snipped
-        var rewind = false;
-        if (container is not null && job.Groups.ContainsKey(container))
-        {
-            foreach (var (_, (current, previous)) in names)
-            {
-                var prev = previous?.FirstOrDefault();
-                if (
-                    prev is not null
-                    && current.AsSpan().Count('_') - prev.AsSpan().Count('_') <= 1
-                    && (current.Length <= 4 || (job.Vendors?.Contains(current) ?? false))
-                )
-                {
-                    rewind = true;
-
-                    break;
-                }
-            }
-        }
-
-        if (rewind)
-        {
-            foreach (var (original, (current, previous)) in names)
-            {
-                var prev = previous?.FirstOrDefault() ?? original;
-                var prevList = previous ?? [];
-                var next = prev[(prev.IndexOf('_') + 1)..];
-                if (next == prev)
-                {
-                    prevList.Remove(prev);
-                }
-                else if (!prevList.Contains(prev))
-                {
-                    prevList.Add(prev);
-                }
-
-                names[original] = (prev[(prev.IndexOf('_') + 1)..], prevList);
-            }
-        }
-
         // Trim the extension vendor names
         foreach (var (original, (current, previous)) in names)
         {