From 11a31f7b8a49fca88bd34be0a8b4e8fb00a75417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ernest=20Sury=C5=9B?=
 <32190237+ErnSur@users.noreply.github.com>
Date: Sat, 18 Mar 2023 10:38:37 +0100
Subject: [PATCH] Bugfix: Handle UXML root tag without namespace (#23)

* added tests and different serialization option

* changelog update

* example update

* remove comment
---
 Assets/Sandbox/CodeGen/CodeGenExample.gen.cs  | 22 ++---
 .../CodeGen/CodeGenExample.gen.cs.meta        |  2 +-
 Assets/Sandbox/CodeGen/CodeGenExample.uxml    |  2 +-
 .../com.quickeye.ui-toolkit-plus/CHANGELOG.md |  7 +-
 .../QuickEye.UxmlBridgeGen/AssemblyInfo.cs    |  3 +
 .../AssemblyInfo.cs.meta                      |  3 +
 .../GenCsClassGenerator.cs                    |  4 +-
 .../QuickEye.UxmlBridgeGen/InlineSettings.cs  | 67 +++++++++------
 .../InlineSettingsUtils.cs                    | 15 ++--
 .../QuickEye.UxmlBridgeGen/PackageInfo.cs     |  2 +-
 .../UxmlHeaderDrawer.cs                       |  4 +-
 .../Tests/Editor/InlineSettingsTests.cs       | 85 +++++++++++++++++++
 .../Tests/Editor/InlineSettingsTests.cs.meta  |  3 +
 .../QuickEye.UIToolkit.Editor.Tests.asmdef    |  3 +-
 .../Tests/Editor/Resources.meta               |  3 +
 .../Editor/Resources/uxml-bridge-tests.meta   |  8 ++
 .../Resources/uxml-bridge-tests/Default.uxml  |  9 ++
 .../uxml-bridge-tests/Default.uxml.meta       | 10 +++
 .../uxml-bridge-tests/NoRootNamespace.uxml    |  9 ++
 .../NoRootNamespace.uxml.meta                 | 10 +++
 .../uxml-bridge-tests/WithCustomSettings.uxml | 10 +++
 .../WithCustomSettings.uxml.meta              | 10 +++
 .../com.quickeye.ui-toolkit-plus/package.json |  2 +-
 Packages/manifest.json                        |  4 +-
 Packages/packages-lock.json                   |  4 +-
 ProjectSettings/ProjectVersion.txt            |  4 +-
 26 files changed, 243 insertions(+), 62 deletions(-)
 create mode 100644 Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/AssemblyInfo.cs
 create mode 100644 Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/AssemblyInfo.cs.meta
 create mode 100644 Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/InlineSettingsTests.cs
 create mode 100644 Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/InlineSettingsTests.cs.meta
 create mode 100644 Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources.meta
 create mode 100644 Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests.meta
 create mode 100644 Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/Default.uxml
 create mode 100644 Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/Default.uxml.meta
 create mode 100644 Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/NoRootNamespace.uxml
 create mode 100644 Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/NoRootNamespace.uxml.meta
 create mode 100644 Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/WithCustomSettings.uxml
 create mode 100644 Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/WithCustomSettings.uxml.meta

diff --git a/Assets/Sandbox/CodeGen/CodeGenExample.gen.cs b/Assets/Sandbox/CodeGen/CodeGenExample.gen.cs
index 6b89391..94e3fa1 100644
--- a/Assets/Sandbox/CodeGen/CodeGenExample.gen.cs
+++ b/Assets/Sandbox/CodeGen/CodeGenExample.gen.cs
@@ -1,7 +1,7 @@
 // -----------------------
 // script auto-generated
 // any changes to this file will be lost on next code generation
-// com.quickeye.ui-toolkit-plus ver: 2.0.0
+// com.quickeye.ui-toolkit-plus ver: 3.0.3
 // -----------------------
 using UnityEngine.UIElements;
 
@@ -9,19 +9,19 @@ namespace SampleAsmDefName
 {
     partial class CodeGenExample
     {
-        private Label _title;
-        private VisualElement _menu;
-        private Button _confirmButton;
-        private QuickEye.UIToolkit.Tab _normalTab;
-        private QuickEye.UIToolkit.TabGroup _dropTab;
+        private Label title;
+        private VisualElement menu;
+        private Button confirmButton;
+        private QuickEye.UIToolkit.Tab normalTab;
+        private QuickEye.UIToolkit.TabGroup dropTab;
     
         protected void AssignQueryResults(VisualElement root)
         {
-            _title = root.Q<Label>("title");
-            _menu = root.Q<VisualElement>("menu");
-            _confirmButton = root.Q<Button>("confirm-button");
-            _normalTab = root.Q<QuickEye.UIToolkit.Tab>("normal-tab");
-            _dropTab = root.Q<QuickEye.UIToolkit.TabGroup>("drop--tab");
+            title = root.Q<Label>("title");
+            menu = root.Q<VisualElement>("menu");
+            confirmButton = root.Q<Button>("confirm-button");
+            normalTab = root.Q<QuickEye.UIToolkit.Tab>("normal-tab");
+            dropTab = root.Q<QuickEye.UIToolkit.TabGroup>("drop--tab");
         }
     }
 }
diff --git a/Assets/Sandbox/CodeGen/CodeGenExample.gen.cs.meta b/Assets/Sandbox/CodeGen/CodeGenExample.gen.cs.meta
index 40667a0..a10dabf 100644
--- a/Assets/Sandbox/CodeGen/CodeGenExample.gen.cs.meta
+++ b/Assets/Sandbox/CodeGen/CodeGenExample.gen.cs.meta
@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {instanceID: 0}
+  icon: {fileID: 2800000, guid: 41141330b8b824474bcbbf2f99e848e2, type: 3}
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Assets/Sandbox/CodeGen/CodeGenExample.uxml b/Assets/Sandbox/CodeGen/CodeGenExample.uxml
index 50ebd79..2608888 100644
--- a/Assets/Sandbox/CodeGen/CodeGenExample.uxml
+++ b/Assets/Sandbox/CodeGen/CodeGenExample.uxml
@@ -1,4 +1,4 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" quick-eye="QuickEye.UIToolkit" xsi="http://www.w3.org/2001/XMLSchema-instance" editor-extension-mode="False">
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" quick-eye="QuickEye.UIToolkit" xsi="http://www.w3.org/2001/XMLSchema-instance" editor-extension-mode="False" gen-cs-file="9b5172de3610e482c94f864fb486ebbb">
     <ui:VisualElement>
         <ui:Label text="Label" display-tooltip-when-elided="true" name="title" />
     </ui:VisualElement>
diff --git a/Packages/com.quickeye.ui-toolkit-plus/CHANGELOG.md b/Packages/com.quickeye.ui-toolkit-plus/CHANGELOG.md
index c82e25f..dc44978 100644
--- a/Packages/com.quickeye.ui-toolkit-plus/CHANGELOG.md
+++ b/Packages/com.quickeye.ui-toolkit-plus/CHANGELOG.md
@@ -1,11 +1,12 @@
-## [3.0.2] - 2022-12-10
+## [3.0.3] - 2023-03-18
+## Fixed
+- System no longer throws exceptions when it processes files with root UXML element without namespace
 
+## [3.0.2] - 2022-12-10
 ## Fixed
 - Moved Editor element `ToolbarDropdownButton` to Editor assembly.
 
-
 ## [3.0.1] - 2022-11-27
-
 ## Added
 - Package description
 
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/AssemblyInfo.cs b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/AssemblyInfo.cs
new file mode 100644
index 0000000..1add364
--- /dev/null
+++ b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly:InternalsVisibleTo("QuickEye.UIToolkit.Editor.Tests")]
\ No newline at end of file
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/AssemblyInfo.cs.meta b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/AssemblyInfo.cs.meta
new file mode 100644
index 0000000..d4cda72
--- /dev/null
+++ b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/AssemblyInfo.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e9b86952925245c5830d7fb584341735
+timeCreated: 1678966739
\ No newline at end of file
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/GenCsClassGenerator.cs b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/GenCsClassGenerator.cs
index 6a2aca2..0cb869a 100644
--- a/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/GenCsClassGenerator.cs
+++ b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/GenCsClassGenerator.cs
@@ -30,7 +30,7 @@ public static void GenerateCs(string uxmlFilePath, bool pingAsset)
                 return;
             }
 
-            var inlineSettings = InlineSettings.FromXml(File.ReadAllText(uxmlFilePath));
+            var inlineSettings = InlineSettings.FromXmlFile(uxmlFilePath);
             var codeStyle = GetFinalCodeStyleRulesFor(inlineSettings);
             var className = Path.GetFileNameWithoutExtension(uxmlFilePath);
             var classNamespace = CsNamespaceUtils.GetCsNamespace(uxmlFilePath, out _);
@@ -90,7 +90,7 @@ private static void TryUpdateGenCsGuid(string uxmlFilePath, string genCsFilePath
             if (inlineSettings.GenCsGuid != genCsGuid)
             {
                 inlineSettings.GenCsGuid = genCsGuid;
-                inlineSettings.WriteXmlAttributes(uxmlFilePath);
+                inlineSettings.WriteTo(uxmlFilePath);
             }
         }
 
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/InlineSettings.cs b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/InlineSettings.cs
index f1c2c32..cf6b687 100644
--- a/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/InlineSettings.cs
+++ b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/InlineSettings.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -5,13 +7,23 @@
 using System.Xml;
 using System.Xml.Linq;
 using System.Xml.Serialization;
-using UnityEngine;
 
 namespace QuickEye.UxmlBridgeGen
 {
-    [XmlRoot("UXML", Namespace = "UnityEngine.UIElements")]
+    [Serializable]
     public class InlineSettings
     {
+        static readonly Dictionary<string, FieldInfo> SerializableFields;
+
+        static InlineSettings()
+        {
+            SerializableFields =
+                (from field in typeof(InlineSettings).GetFields(BindingFlags.Instance | BindingFlags.Public)
+                    let attr = field.GetCustomAttribute<XmlAttributeAttribute>()
+                    where attr != null
+                    select (attr.AttributeName, field)).ToDictionary(t => t.AttributeName, t => t.field);
+        }
+
         [XmlAttribute("gen-cs-namespace")]
         public string CsNamespace;
 
@@ -37,49 +49,52 @@ public class InlineSettings
         [XmlAttribute("gen-cs-class-style")]
         public string ClassStyle;
 
-        public static void test(string uxmlPath)
+        public static InlineSettings FromXmlFile(string xmlFilePath)
         {
-            var root = FromXml(File.ReadAllText(uxmlPath));
-            Debug.Log($"ns {root.CsNamespace}");
-            root.GenCsGuid = null;
-            root.WriteXmlAttributes(uxmlPath);
+            return FromXml(File.ReadAllText(xmlFilePath));
         }
 
         public static InlineSettings FromXml(string xml)
         {
-            var stream = new StringReader(xml);
+            var inlineSettings = new InlineSettings();
+            using (var sr = new StringReader(xml))
+            {
+                using (var xr = XmlReader.Create(sr))
+                {
+                    // Move to the root element
+                    xr.MoveToContent();
+                    foreach (var kvp in SerializableFields)
+                    {
+                        kvp.Value.SetValue(inlineSettings, xr.GetAttribute(kvp.Key));
+                    }
+                }
+            }
 
-            var serializer = new XmlSerializer(typeof(InlineSettings));
-            var root = (InlineSettings)serializer.Deserialize(stream);
-            return root;
+            return inlineSettings;
         }
 
-        public void WriteXmlAttributes(string uxmlPath)
+        public void WriteTo(string uxmlPath)
         {
             var root = XDocument.Parse(File.ReadAllText(uxmlPath)).Root;
             if (root == null)
                 return;
-            foreach (var (attributeName, value) in GetSerializableAttributes())
-            {
-                if (value != null)
-                    root.SetAttributeValue(attributeName, value);
-                else
-                    root.Attribute(attributeName)?.Remove();
-            }
+            AddTo(root);
 
             Write(uxmlPath, root);
         }
 
-        private (string attributeName, string value)[] GetSerializableAttributes()
+        public void AddTo(XElement uxmlRootElement)
         {
-            var serializableAttributes = from field in GetType().GetFields(BindingFlags.Instance | BindingFlags.Public)
-                let attr = field.GetCustomAttribute<XmlAttributeAttribute>()
-                where attr != null
-                select (attr.AttributeName, field.GetValue(this) as string);
-            return serializableAttributes.ToArray();
+            foreach (var (attributeName, fieldInfo) in SerializableFields)
+            {
+                var value = fieldInfo.GetValue(this);
+                if (value != null)
+                    uxmlRootElement.SetAttributeValue(attributeName, value);
+                else
+                    uxmlRootElement.Attribute(attributeName)?.Remove();
+            }
         }
 
-
         private static void Write(string uxmlPath, XElement root)
         {
             using (var writer = new XmlTextWriter(uxmlPath, Encoding.UTF8))
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/InlineSettingsUtils.cs b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/InlineSettingsUtils.cs
index 2278aa3..c65fc67 100644
--- a/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/InlineSettingsUtils.cs
+++ b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/InlineSettingsUtils.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using UnityEditor;
+using UnityEngine;
 
 namespace QuickEye.UxmlBridgeGen
 {
@@ -8,10 +9,10 @@ internal static class InlineSettingsUtils
     {
         public static bool TryGetGenCsFilePath(string uxmlPath, out string genCsPath, out bool isMissing)
         {
-            var root = InlineSettings.FromXml(File.ReadAllText(uxmlPath));
+            var root = InlineSettings.FromXmlFile(uxmlPath);
             return root.TryGetGenCsFilePath(out genCsPath, out isMissing);
         }
-        
+
         public static bool TryGetGenCsFilePath(this InlineSettings settings, out string genCsPath, out bool isMissing)
         {
             if (settings.GenCsGuid == null)
@@ -32,18 +33,18 @@ public static bool TryGetGenCsFilePath(this InlineSettings settings, out string
             isMissing = false;
             return true;
         }
-        
+
         public static string GetCsNamespace(string uxmlPath)
         {
-            var root = InlineSettings.FromXml(File.ReadAllText(uxmlPath));
+            var root = InlineSettings.FromXmlFile(uxmlPath);
             return root.CsNamespace;
         }
 
         public static void WriteCsNamespace(string uxmlPath, string csNamespace)
         {
-            var root = InlineSettings.FromXml(File.ReadAllText(uxmlPath));
+            var root = InlineSettings.FromXmlFile(uxmlPath);
             root.CsNamespace = csNamespace;
-            root.WriteXmlAttributes(uxmlPath);
+            root.WriteTo(uxmlPath);
         }
 
         public static CodeStyleRules GetCodeStyleRules(string uxml)
@@ -51,7 +52,7 @@ public static CodeStyleRules GetCodeStyleRules(string uxml)
             var root = InlineSettings.FromXml(uxml);
             return GetCodeStyleRules(root);
         }
-        
+
         public static CodeStyleRules GetCodeStyleRules(this InlineSettings settings)
         {
             return new CodeStyleRules
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/PackageInfo.cs b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/PackageInfo.cs
index a4765e6..3fb2d78 100644
--- a/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/PackageInfo.cs
+++ b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/PackageInfo.cs
@@ -4,7 +4,7 @@ namespace QuickEye.UxmlBridgeGen
 {
     internal static class PackageInfo
     {
-        public const string Version = "3.0.2";
+        public const string Version = "3.0.3";
         public const string Name = "com.quickeye.ui-toolkit-plus";
         public const string DisplayName = "UI Toolkit Plus";
     }
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/UxmlHeaderDrawer.cs b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/UxmlHeaderDrawer.cs
index a45da9a..24e5b6a 100644
--- a/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/UxmlHeaderDrawer.cs
+++ b/Packages/com.quickeye.ui-toolkit-plus/Editor/QuickEye.UxmlBridgeGen/UxmlHeaderDrawer.cs
@@ -42,7 +42,7 @@ public UxmlHeaderDrawer(Editor editor) : base(editor)
         private void Setup(Editor editor)
         {
             _firstTargetUxmlPath = ((ScriptedImporter)editor.target).assetPath;
-            _inlineSettings = InlineSettings.FromXml(File.ReadAllText(_firstTargetUxmlPath));
+            _inlineSettings = InlineSettings.FromXmlFile(_firstTargetUxmlPath);
             InlineSettingsUtils.TryGetGenCsFilePath(_firstTargetUxmlPath, out var firstTargetGenCsPath,
                 out _firstTargetGenCsMissing);
             _firstTargetGenCs = AssetDatabase.LoadAssetAtPath<MonoScript>(firstTargetGenCsPath);
@@ -87,7 +87,7 @@ private void GenCsField()
                             "Yes", "No"))
                     {
                         _inlineSettings.GenCsGuid = AssetDatabase.AssetPathToGUID(newFilePath);
-                        _inlineSettings.WriteXmlAttributes(_firstTargetUxmlPath);
+                        _inlineSettings.WriteTo(_firstTargetUxmlPath);
                         Setup(Editor);
                     }
                 }
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/InlineSettingsTests.cs b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/InlineSettingsTests.cs
new file mode 100644
index 0000000..e464b3b
--- /dev/null
+++ b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/InlineSettingsTests.cs
@@ -0,0 +1,85 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Linq;
+using NUnit.Framework;
+using QuickEye.UxmlBridgeGen;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace QuickEye.UIToolkit.Tests
+{
+    public class InlineSettingsTests
+    {
+        const string ResourcesDir = "uxml-bridge-tests/";
+
+        static readonly Dictionary<UxmlFileType, string> UxmlContents = new Dictionary<UxmlFileType, string>()
+        {
+            { UxmlFileType.Default, LoadUxml("Default") },
+            { UxmlFileType.NoRootNamespace, LoadUxml("NoRootNamespace") },
+            { UxmlFileType.WithCustomSettings, LoadUxml("WithCustomSettings") }
+        };
+
+        static readonly InlineSettings CustomSettings = new InlineSettings()
+        {
+            CsNamespace = "test.test",
+            GenCsGuid = "guid",
+            PrivateFieldPrefix = "pf-prefix",
+            PrivateFieldSuffix = "pf-suffix",
+            PrivateFieldStyle = CaseStyle.LowerCamelCase.ToString(),
+            ClassPrefix = "c-prefix",
+            ClassSuffix = "c-suffix",
+            ClassStyle = CaseStyle.UpperCamelCase.ToString(),
+        };
+
+        [TestCase(UxmlFileType.Default, false)]
+        [TestCase(UxmlFileType.NoRootNamespace, false)]
+        [TestCase(UxmlFileType.WithCustomSettings, true)]
+        public void Deserialize_Settings(UxmlFileType fileType, bool hasCustomSettings)
+        {
+            var uxml = UxmlContents[fileType];
+
+            var settings = InlineSettings.FromXml(uxml);
+
+            Assert.IsNotNull(settings);
+            if (hasCustomSettings)
+            {
+                AssertAreSettingsEqual(CustomSettings, settings);
+            }
+        }
+
+        [Test]
+        public void Serialize_Settings()
+        {
+            var uxml = UxmlContents[UxmlFileType.Default];
+            var root = XDocument.Parse(uxml).Root;
+            var settings = InlineSettings.FromXml(uxml);
+
+            AssertAreSettingsEqual(new InlineSettings(), settings);
+            CustomSettings.AddTo(root);
+            settings = InlineSettings.FromXml(root.ToString());
+            AssertAreSettingsEqual(CustomSettings, settings);
+        }
+
+        private void AssertAreSettingsEqual(InlineSettings expected, InlineSettings actual)
+        {
+            var json = JsonUtility.ToJson(actual);
+            var expectedJson = JsonUtility.ToJson(expected);
+            Assert.AreEqual(expectedJson, json);
+        }
+
+        private static string LoadUxml(string fileName)
+        {
+            var asset = Resources.Load<VisualTreeAsset>(ResourcesDir + fileName);
+            var path = AssetDatabase.GetAssetPath(asset);
+            return File.ReadAllText(path);
+        }
+
+        public enum UxmlFileType
+        {
+            Default,
+            NoRootNamespace,
+            WithCustomSettings
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/InlineSettingsTests.cs.meta b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/InlineSettingsTests.cs.meta
new file mode 100644
index 0000000..4b39c7c
--- /dev/null
+++ b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/InlineSettingsTests.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d92416b5d79a4af5b5c845a78f933903
+timeCreated: 1678966223
\ No newline at end of file
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/QuickEye.UIToolkit.Editor.Tests.asmdef b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/QuickEye.UIToolkit.Editor.Tests.asmdef
index cc55138..bf1beb7 100644
--- a/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/QuickEye.UIToolkit.Editor.Tests.asmdef
+++ b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/QuickEye.UIToolkit.Editor.Tests.asmdef
@@ -4,7 +4,8 @@
         "UnityEngine.TestRunner",
         "UnityEditor.TestRunner",
         "QuickEye.UIToolkit.Editor",
-        "QuickEye.UIToolkit"
+        "QuickEye.UIToolkit",
+        "QuickEye.UxmlBridgeGen"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources.meta b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources.meta
new file mode 100644
index 0000000..eb293ff
--- /dev/null
+++ b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 88a3d56629f24530a38c426683c953ae
+timeCreated: 1678966297
\ No newline at end of file
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests.meta b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests.meta
new file mode 100644
index 0000000..c39b5b0
--- /dev/null
+++ b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0b4ee3bbe6d683548a46e9e1d918ef86
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/Default.uxml b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/Default.uxml
new file mode 100644
index 0000000..634501d
--- /dev/null
+++ b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/Default.uxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<engine:UXML
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:engine="UnityEngine.UIElements"
+    xmlns:editor="UnityEditor.UIElements"
+    xsi:noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd"
+>
+    
+</engine:UXML>
\ No newline at end of file
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/Default.uxml.meta b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/Default.uxml.meta
new file mode 100644
index 0000000..944c2f5
--- /dev/null
+++ b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/Default.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 281fb341567613a4ba05965f9bc2cbe5
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/NoRootNamespace.uxml b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/NoRootNamespace.uxml
new file mode 100644
index 0000000..03796f0
--- /dev/null
+++ b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/NoRootNamespace.uxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<UXML
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:engine="UnityEngine.UIElements"
+    xmlns:editor="UnityEditor.UIElements"
+    xsi:noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd"
+>
+    <engine:Button/>
+</UXML>
\ No newline at end of file
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/NoRootNamespace.uxml.meta b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/NoRootNamespace.uxml.meta
new file mode 100644
index 0000000..dca6e5b
--- /dev/null
+++ b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/NoRootNamespace.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: ded501df69acec040a893c2412608823
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/WithCustomSettings.uxml b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/WithCustomSettings.uxml
new file mode 100644
index 0000000..5e4ff55
--- /dev/null
+++ b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/WithCustomSettings.uxml
@@ -0,0 +1,10 @@
+<engine:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:engine="UnityEngine.UIElements" xmlns:editor="UnityEditor.UIElements" xsi:noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" 
+             gen-cs-namespace="test.test"
+             gen-cs-file="guid"
+             gen-cs-private-field-prefix="pf-prefix"
+             gen-cs-private-field-suffix="pf-suffix"
+             gen-cs-private-field-style="LowerCamelCase"
+             gen-cs-class-prefix="c-prefix"
+             gen-cs-class-suffix="c-suffix"
+             gen-cs-class-style="UpperCamelCase">
+</engine:UXML>
\ No newline at end of file
diff --git a/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/WithCustomSettings.uxml.meta b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/WithCustomSettings.uxml.meta
new file mode 100644
index 0000000..e84f888
--- /dev/null
+++ b/Packages/com.quickeye.ui-toolkit-plus/Tests/Editor/Resources/uxml-bridge-tests/WithCustomSettings.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 5f3f0be45d1598b43ae694e7babc3aac
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Packages/com.quickeye.ui-toolkit-plus/package.json b/Packages/com.quickeye.ui-toolkit-plus/package.json
index f777270..8bedcc0 100644
--- a/Packages/com.quickeye.ui-toolkit-plus/package.json
+++ b/Packages/com.quickeye.ui-toolkit-plus/package.json
@@ -2,7 +2,7 @@
   "name": "com.quickeye.ui-toolkit-plus",
   "displayName": "UI Toolkit Plus",
   "description": "- Boilerplate Code Generation\n- Tabs\n- Reorderable Manipulator\n- Built-in USS Exporter",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "unity": "2021.3",
   "author": "Quick Eye",
   "type": "library",
diff --git a/Packages/manifest.json b/Packages/manifest.json
index b640551..21c9dbd 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "com.unity.ide.rider": "3.0.15",
-    "com.unity.ide.visualstudio": "2.0.16",
+    "com.unity.ide.rider": "3.0.18",
+    "com.unity.ide.visualstudio": "2.0.17",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.imageconversion": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index c21f6bc..3323e2b 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -14,7 +14,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.15",
+      "version": "3.0.18",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -23,7 +23,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.16",
+      "version": "2.0.17",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index a24a977..8e3af85 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.7f1
-m_EditorVersionWithRevision: 2021.3.7f1 (24e8595d6d43)
+m_EditorVersion: 2021.3.19f1
+m_EditorVersionWithRevision: 2021.3.19f1 (c9714fde33b6)