CS Generation Fixes

- Column support - Template Support
ErnSur · Sep 25, 2022 · 594fb47 · 594fb47
1 parent edcce40
commit 594fb47
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 3 deletions.
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Editor/UxmlClassGeneration/UxmlClassGenerator.cs b/Packages/com.quickeye.ui-toolkit-plus/Editor/UxmlClassGeneration/UxmlClassGenerator.cs
@@ -9,7 +9,15 @@ namespace QuickEye.UIToolkit.Editor
     internal static class UxmlClassGenerator
     {
         private const string GenerateCsMenuItemName = "CONTEXT/VisualTreeAsset/Generate C# Class";
-
+
+        private static readonly string[] IgnoredTagFullnames =
+        {
+            "UnityEngine.UIElements.Template",
+            "Style"
+        };
+
+        private const string ColumnFullName = "UnityEngine.UIElements.Column";
+
         [MenuItem(GenerateCsMenuItemName)]
         private static void GenerateGenCs(MenuCommand command)
         {
@@ -30,7 +38,10 @@ public static void GenerateGenCs(VisualTreeAsset asset)
             var settings = CodeGenSettings.FromUxml(uxml);
             if (UxmlParser.TryGetElementsWithName(uxml, out var elements))
             {
-                GenerateScript(asset.name, elements, GetGenCsFilePath(path), settings);
+                var validElements = elements
+                    .Where(e => !IgnoredTagFullnames.Contains(e.FullyQualifiedTypeName))
+                    .ToArray();
+                GenerateScript(asset.name, validElements, GetGenCsFilePath(path), settings);
             }
         }
 
@@ -48,9 +59,28 @@ private static string GetFieldAssigment(UxmlElement element, CodeGenSettings set
             var name = element.NameAttribute;
             var varName = settings.FieldPrefix + CodeGeneration.UssNameToVariableName(name);
 
+            if (element.FullyQualifiedTypeName == ColumnFullName)
+            {
+                return GetFieldAssigmentForColumn(element, settings, varName, name);
+            }
+
             return $"{varName} = root.Q<{type}>(\"{name}\");";
         }
 
+        private static string GetFieldAssigmentForColumn(UxmlElement element, CodeGenSettings settings, string varName,
+            string name)
+        {
+            var multiColumnElement = element.XElement.Parent?.Parent?.ToUxmlElement();
+
+            if (string.IsNullOrEmpty(multiColumnElement?.NameAttribute))
+                return $"// Could not find \"{name}\" MultiColumn parent with a name.";
+
+            var multiColumnEleVarName = settings.FieldPrefix +
+                                        CodeGeneration.UssNameToVariableName(multiColumnElement
+                                            .NameAttribute);
+            return $"{varName} = {multiColumnEleVarName}.columns[\"{name}\"];";
+        }
+
         private static void GenerateScript(string scriptName, UxmlElement[] uxmlElements, string path,
             CodeGenSettings settings)
         {

diff --git a/Packages/com.quickeye.ui-toolkit-plus/Editor/UxmlClassGeneration/UxmlElement.cs b/Packages/com.quickeye.ui-toolkit-plus/Editor/UxmlClassGeneration/UxmlElement.cs
@@ -5,14 +5,16 @@ namespace QuickEye.UIToolkit.Editor
 {
     internal class UxmlElement
     {
+        public readonly XElement XElement;
         public readonly string Namespace;
         public readonly string TypeName;
         public readonly string NameAttribute;
         public string FullyQualifiedTypeName => $"{Namespace}.{TypeName}";
         public bool IsUnityEngineType => Namespace == "UnityEngine.UIElements";
-
+        
         public UxmlElement(XElement xElement)
         {
+            XElement = xElement;
             var localName = xElement.Name.LocalName;
 
             Namespace = xElement.Name.NamespaceName != XNamespace.None
@@ -22,6 +24,16 @@ public UxmlElement(XElement xElement)
                 ? localName.Split('.').Last()
                 : localName;
             NameAttribute = xElement.Attribute("name")?.Value;
+            if (FullyQualifiedTypeName == "UnityEngine.UIElements.Instance")
+                TypeName = "TemplateContainer";
+        }
+    }
+
+    internal static class XElementExtensions
+    {
+        public static UxmlElement ToUxmlElement(this XElement xElement)
+        {
+            return new UxmlElement(xElement);
         }
     }
 }