Re-factor "IsCompilerGenerated"

v1ckxy · Jul 20, 2024 · 7de145f · 7de145f
1 parent 41d57d6
commit 7de145f
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 21 deletions.
diff --git a/src/Core/Classes/Props/UDelegateProperty.cs b/src/Core/Classes/Props/UDelegateProperty.cs
@@ -50,14 +50,6 @@ protected override void Deserialize()
             }
         }
 
-#if DNF
-        public override bool IsCompilerGenerated()
-        {
-            // delegate properties are compiler generated in DNF, not part of the source.
-            return Package.Build == UnrealPackage.GameBuild.BuildName.DNF;
-        }
-#endif
-
         /// <inheritdoc/>
         public override string GetFriendlyType()
         {

diff --git a/src/Core/Classes/Props/UProperty.cs b/src/Core/Classes/Props/UProperty.cs
@@ -288,11 +288,6 @@ public bool IsParm()
             return HasPropertyFlag(PropertyFlagsLO.Parm);
         }
 
-        public virtual bool IsCompilerGenerated()
-        {
-            return false;
-        }
-
         public virtual string GetFriendlyInnerType()
         {
             return string.Empty;

diff --git a/src/Core/Classes/UStructDecompiler.cs b/src/Core/Classes/UStructDecompiler.cs
@@ -1,6 +1,7 @@
 #if DECOMPILE
 using System;
 using System.Linq;
+using UELib.Decompiler;
 
 namespace UELib.Core
 {
@@ -203,24 +204,32 @@ protected string FormatProperties()
             // Don't use foreach, screws up order.
             foreach (var property in Variables)
             {
-                if (property.IsCompilerGenerated())
-                    continue;
+                bool isCompilerGenerated = IsCompilerAutoGeneratedHelper.Visit((dynamic)property);
 
                 // Fix for properties within structs
-                output += "\r\n" +
-                          property.PreDecompile() +
-                          $"{UDecompilingState.Tabs}var";
+                output += "\r\n";
+                // MetaData like comments.
+                string preOutput = property.PreDecompile();
+                output += preOutput;
+                output += UDecompilingState.Tabs;
+                if (isCompilerGenerated)
+                {
+                    output += "//";
+                }
+
+                output += "var";
                 if (property.CategoryName != null && !property.CategoryName.IsNone())
                 {
                     output += property.CategoryName == Name
                         ? "()"
                         : $"({property.CategoryName})";
                 }
                 output += $" {property.Decompile()};";
-                string s = property.PostDecompile();
-                if (!string.IsNullOrEmpty(s))
+
+                string postOutput = property.PostDecompile();
+                if (!string.IsNullOrEmpty(postOutput))
                 {
-                    output += s;
+                    output += postOutput;
                 }
             }
 

diff --git a/src/Decompiler/IsCompilerAutoGeneratedHelper.cs b/src/Decompiler/IsCompilerAutoGeneratedHelper.cs
@@ -0,0 +1,25 @@
+using System;
+using UELib.Core;
+
+namespace UELib.Decompiler
+{
+    // Static non-interface visitor class because we don't require any polymorphism here.
+    public static class IsCompilerAutoGeneratedHelper
+    {
+        public static bool Visit(UDelegateProperty obj)
+        {
+            return obj.Name.StartsWith("__", StringComparison.OrdinalIgnoreCase) &&
+                   obj.Name.EndsWith("__Delegate", StringComparison.OrdinalIgnoreCase);
+        }
+
+        public static bool Visit(UField obj)
+        {
+            return false;
+        }
+
+        public static bool Visit(UObject obj)
+        {
+            return obj.Name.StartsWith("Default__", StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}