Support inherited objects

aaubry · Jan 29, 2023 · 72641d1 · 72641d1
1 parent 61573a9
commit 72641d1
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 16 deletions.
diff --git a/YamlDotNet.Analyzers.StaticGenerator/ClassSyntaxReceiver.cs b/YamlDotNet.Analyzers.StaticGenerator/ClassSyntaxReceiver.cs
@@ -59,26 +59,30 @@ public void OnVisitSyntaxNode(GeneratorSyntaxContext context)
                             classObject = new ClassObject(className, classSymbol);
                             Classes[className] = classObject;
                         }
-                        var members = classSymbol.GetMembers();
-                        foreach (var member in members)
+                        while (classSymbol != null)
                         {
-                            if (member.IsStatic ||
-                                member.DeclaredAccessibility != Accessibility.Public ||
-                                member.GetAttributes().Any(x => x.AttributeClass!.ToDisplayString() == "YamlDotNet.Serialization.YamlIgnoreAttribute"))
+                            var members = classSymbol.GetMembers();
+                            foreach (var member in members)
                             {
-                                continue;
-                            }
+                                if (member.IsStatic ||
+                                    member.DeclaredAccessibility != Accessibility.Public ||
+                                    member.GetAttributes().Any(x => x.AttributeClass!.ToDisplayString() == "YamlDotNet.Serialization.YamlIgnoreAttribute"))
+                                {
+                                    continue;
+                                }
 
-                            if (member is IPropertySymbol propertySymbol)
-                            {
-                                classObject.PropertySymbols.Add(propertySymbol);
-                                CheckForSupportedGeneric(propertySymbol.Type);
-                            }
-                            else if (member is IFieldSymbol fieldSymbol)
-                            {
-                                classObject.FieldSymbols.Add(fieldSymbol);
-                                CheckForSupportedGeneric(fieldSymbol.Type);
+                                if (member is IPropertySymbol propertySymbol)
+                                {
+                                    classObject.PropertySymbols.Add(propertySymbol);
+                                    CheckForSupportedGeneric(propertySymbol.Type);
+                                }
+                                else if (member is IFieldSymbol fieldSymbol)
+                                {
+                                    classObject.FieldSymbols.Add(fieldSymbol);
+                                    CheckForSupportedGeneric(fieldSymbol.Type);
+                                }
                             }
+                            classSymbol = classSymbol.BaseType;
                         }
                     }
                 }

diff --git a/YamlDotNet.Core7AoTCompileTest/Program.cs b/YamlDotNet.Core7AoTCompileTest/Program.cs
@@ -24,6 +24,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using System.Security.Cryptography.X509Certificates;
 using YamlDotNet.Core;
 using YamlDotNet.Core.Events;
 using YamlDotNet.Serialization;
@@ -62,6 +63,9 @@
 MyList:
 - a
 - b
+Inherited:
+  Inherited: hello
+  NotInherited: world
 ";
 
 var input = new StringReader(yaml);
@@ -117,6 +121,9 @@
         Console.WriteLine("MyList = <{0}>", value);
     }
 }
+Console.WriteLine("Inherited == null: <{0}>", x.Inherited == null);
+Console.WriteLine("Inherited.Inherited: <{0}>", x.Inherited?.Inherited);
+Console.WriteLine("Inherited.NotInherited: <{0}>", x.Inherited?.NotInherited);
 
 Console.WriteLine("==============");
 Console.WriteLine("Serialized:");
@@ -181,6 +188,18 @@ public class PrimitiveTypes
     public MyArray? MyArray { get; set; }
     public Dictionary<string, string>? MyDictionary { get; set; }
     public List<string>? MyList { get; set; }
+    public Inherited Inherited { get; set; }
+}
+
+public class InheritedBase
+{
+    public string Inherited { get; set; }
+}
+
+[YamlSerializable]
+public class Inherited : InheritedBase
+{
+    public string NotInherited { get; set; }
 }
 
 public enum MyTestEnum