fix: reading namespace from file OnEnable

hana-games · Dec 14, 2022 · f05cb79 · f05cb79
1 parent 38d1bfc
commit f05cb79
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/Scripts/Editor/Core/CollectionCustomEditor.cs b/Scripts/Editor/Core/CollectionCustomEditor.cs
@@ -55,6 +55,7 @@ public void OnEnable()
             CheckGeneratedCodeLocation();
             CheckIfCanBePartial();
             CheckGeneratedStaticFileName();
+            ValidateGeneratedFileNamespace();
             editorInstance = this;
         }
 
@@ -664,6 +665,21 @@ private void DrawGeneratedFileName()
         }
 
         private void DrawGeneratedFileNamespace()
+        {
+            SerializedProperty fileNamespaceSerializedProperty = serializedObject.FindProperty("generateStaticFileNamespace");
+
+            using (EditorGUI.ChangeCheckScope changeCheck = new EditorGUI.ChangeCheckScope())
+            {
+                string newFileName = EditorGUILayout.DelayedTextField("Namespace", fileNamespaceSerializedProperty.stringValue);
+                if (changeCheck.changed)
+                {
+                    fileNamespaceSerializedProperty.stringValue = newFileName;
+                    fileNamespaceSerializedProperty.serializedObject.ApplyModifiedProperties();
+                }
+            }
+        }
+
+        private void ValidateGeneratedFileNamespace()
         {
             SerializedProperty fileNamespaceSerializedProperty = serializedObject.FindProperty("generateStaticFileNamespace");
             if (string.IsNullOrEmpty(fileNamespaceSerializedProperty.stringValue))
@@ -678,16 +694,6 @@ private void DrawGeneratedFileNamespace()
                     }
                 }
             }
-
-            using (EditorGUI.ChangeCheckScope changeCheck = new EditorGUI.ChangeCheckScope())
-            {
-                string newFileName = EditorGUILayout.DelayedTextField("Namespace", fileNamespaceSerializedProperty.stringValue);
-                if (changeCheck.changed)
-                {
-                    fileNamespaceSerializedProperty.stringValue = newFileName;
-                    fileNamespaceSerializedProperty.serializedObject.ApplyModifiedProperties();
-                }
-            }
         }
 
         private void DrawAutomaticallyLoaded()