From 89d8712bb5b8f4ecda62f2895c9075ef53f8ceec Mon Sep 17 00:00:00 2001
From: naninunenoy <naninuneno0411@gmail.com>
Date: Wed, 16 Dec 2020 23:01:15 +0900
Subject: [PATCH] add rootNamespace property

---
 .../Editor/AsmdefCustomCreateView.cs             | 16 ++++++++++++++--
 .../Editor/AsmdefCustomCreateView.uxml           |  3 ++-
 .../Editor/AssemblyDefinitionJson.cs             |  3 +++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs
index 8ac0e69..9c963af 100644
--- a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs
+++ b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.cs
@@ -37,8 +37,10 @@ namespace AsmdefHelper.CustomCreate.Editor {
             var NameTextField = root.Q<TextField>(className: "NameTextField");
             var AllowUnsafeToggle = root.Q<Toggle>(className: "AllowUnsafeToggle");
             var AutoReferencedToggle = root.Q<Toggle>(className: "AutoReferencedToggle");
-            var OverrideReferencesToggle = root.Q<Toggle>(className: "OverrideReferencesToggle");
             var NoEngineReferencesToggle = root.Q<Toggle>(className: "NoEngineReferencesToggle");
+            var OverrideReferencesToggle = root.Q<Toggle>(className: "OverrideReferencesToggle");
+            var RootNamespaceTextField = root.Q<TextField>(className: "RootNamespaceTextField");
+
             var IsEditorToggle = root.Q<Toggle>(className: "IsEditorToggle");
             var CreateButton = root.Q<Button>(className: "CreateButton");
 
@@ -47,8 +49,15 @@ namespace AsmdefHelper.CustomCreate.Editor {
             var assetPath = AssetDatabase.GetAssetPath(asset);
             var directory = string.IsNullOrWhiteSpace(assetPath) ? "Assets/" : assetPath;
             PathTextField.value = directory;
-            NameTextField.value = directory.Replace("Assets/", "").Replace('/', '.');
+            var defaultName = directory.Replace("Assets/", "").Replace('/', '.');
+            NameTextField.value = defaultName;
 
+            // RootNamespace が設定できるのは2020.2以降
+#if UNITY_2020_2_OR_NEWER
+            RootNamespaceTextField.value = defaultName;
+#else
+            root.Remove(RootNamespaceTextField);
+#endif
             // .asmdefを作成して閉じる
             CreateButton.clickable.clicked += () => {
                 var asmdefName = NameTextField.value;
@@ -60,6 +69,9 @@ namespace AsmdefHelper.CustomCreate.Editor {
                     noEngineReferences = NoEngineReferencesToggle.value,
                     includePlatforms = IsEditorToggle.value ? new[] { "Editor" } : new string[0]
                 };
+#if UNITY_2020_2_OR_NEWER
+                asmdef.rootNamespace = RootNamespaceTextField.value;
+#endif
                 var asmdefJson = JsonUtility.ToJson(asmdef, true);
                 var asmdefPath = $"{directory}/{asmdefName}.asmdef";
                 File.WriteAllText(asmdefPath, asmdefJson, Encoding.UTF8);
diff --git a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml
index 1386e62..290c110 100644
--- a/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml
+++ b/Assets/AsmdefHelper/CustomCreate/Editor/AsmdefCustomCreateView.uxml
@@ -11,8 +11,9 @@
         <engine:TextField class="NameTextField"  label="Name" text="ASMDEF_NAME_HERE"/>
         <engine:Toggle class="AllowUnsafeToggle"  label="Allow 'unsafe' Code" value="false"/>
         <engine:Toggle class="AutoReferencedToggle"  label="Auto Referenced" value="true"/>
-        <engine:Toggle class="OverrideReferencesToggle"  label="Override Referenced" value="false"/>
         <engine:Toggle class="NoEngineReferencesToggle"  label="No Engine References" value="false"/>
+        <engine:Toggle class="OverrideReferencesToggle"  label="Override Referenced" value="false"/>
+        <engine:TextField class="RootNamespaceTextField"  label="Root Namespace" text="ROOT_NAMESPACE_HERE"/>
         <engine:Toggle class="IsEditorToggle"  label="Is Editor" value="false"/>
         <engine:Button class="CreateButton"  text="Create" />
     </engine:Box>
diff --git a/Assets/AsmdefHelper/CustomCreate/Editor/AssemblyDefinitionJson.cs b/Assets/AsmdefHelper/CustomCreate/Editor/AssemblyDefinitionJson.cs
index 898c7d8..9d5ccb5 100644
--- a/Assets/AsmdefHelper/CustomCreate/Editor/AssemblyDefinitionJson.cs
+++ b/Assets/AsmdefHelper/CustomCreate/Editor/AssemblyDefinitionJson.cs
@@ -1,6 +1,9 @@
 namespace AsmdefHelper.CustomCreate.Editor {
     public class AssemblyDefinitionJson {
         public string name = string.Empty;
+#if UNITY_2020_2_OR_NEWER
+        public string rootNamespace = string.Empty;
+#endif
         public string[] references = new string[0];
         public string[] includePlatforms = new string[0];
         public string[] excludePlatforms = new string[0];