Add non-abstract base classes as extension types

bonsai-rx · Oct 5, 2022 · 8e7d40b · 8e7d40b
1 parent 6591814
commit 8e7d40b
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/Bonsai.Core/WorkflowBuilder.cs b/Bonsai.Core/WorkflowBuilder.cs
@@ -432,10 +432,19 @@ static IEnumerable<object> GetWorkflowElements(ExpressionBuilder builder)
             }
         }
 
+        static IEnumerable<Type> GetBaseTypes(Type type)
+        {
+            while (type != null && type != typeof(object) && !type.IsAbstract)
+            {
+                yield return type;
+                type = type.BaseType;
+            }
+        }
+
         static IEnumerable<Type> GetExtensionTypes(ExpressionBuilderGraph workflow)
         {
             return workflow.SelectMany(node => GetWorkflowElements(node.Value))
-                .Select(element => element.GetType())
+                .SelectMany(element => GetBaseTypes(element.GetType()))
                 .Except(SerializerExtraTypes)
                 .Except(SerializerLegacyTypes);
         }
@@ -837,7 +846,7 @@ static void WriteXmlAttributes(XmlReader reader, XmlWriter writer, bool lookupTy
                                         }
                                     }
 
-                                    types.Add(type);
+                                    types.UnionWith(GetBaseTypes(type));
                                     if (!string.IsNullOrEmpty(typeArguments))
                                     {
                                         var typeRef = new CodeTypeReference(type);