Refactor validation logic in GameObject.Component.Add and GameObject.Component.Modify to improve error handling

Author: IvanMurzak

Unity-MCP-Plugin/Assets/root/Editor/Scripts/API/Tool/GameObject.Component.Add.cs

@@ -44,6 +44,12 @@ GameObjectRef gameObjectRef
             if (!gameObjectRef.IsValid(out var gameObjectValidationError))
                 throw new ArgumentException(gameObjectValidationError, nameof(gameObjectRef));
 
+            if (componentNames == null)
+                throw new ArgumentNullException(nameof(componentNames), "No component names provided.");
+
+            if (componentNames.Length == 0)
+                throw new ArgumentException("No component names provided.", nameof(componentNames));
+
             return MainThread.Instance.Run(() =>
             {
                 var go = gameObjectRef.FindGameObject(out var error);
@@ -53,12 +59,6 @@ GameObjectRef gameObjectRef
                 if (go == null)
                     throw new Exception("GameObject not found.");
 
-                if (componentNames == null)
-                    throw new ArgumentNullException(nameof(componentNames), "No component names provided.");
-
-                if (componentNames.Length == 0)
-                    throw new ArgumentException("No component names provided.", nameof(componentNames));
-
                 var response = new AddComponentResponse();
 
                 foreach (var componentName in componentNames)

Unity-MCP-Plugin/Assets/root/Editor/Scripts/API/Tool/GameObject.Component.Modify.cs

@@ -44,14 +44,14 @@ public ModifyComponentResponse ModifyComponent
             SerializedMember componentDiff
         )
         {
-            return MainThread.Instance.Run(() =>
-            {
-                if (!gameObjectRef.IsValid(out var gameObjectValidationError))
-                    throw new ArgumentException(gameObjectValidationError, nameof(gameObjectRef));
+            if (!gameObjectRef.IsValid(out var gameObjectValidationError))
+                throw new ArgumentException(gameObjectValidationError, nameof(gameObjectRef));
 
-                if (!componentRef.IsValid(out var componentValidationError))
-                    throw new ArgumentException(componentValidationError, nameof(componentRef));
+            if (!componentRef.IsValid(out var componentValidationError))
+                throw new ArgumentException(componentValidationError, nameof(componentRef));
 
+            return MainThread.Instance.Run(() =>
+            {
                 var go = gameObjectRef.FindGameObject(out var error);
                 if (error != null)
                     throw new Exception(error);

Unity-MCP-Plugin/Assets/root/Editor/Scripts/API/Tool/GameObject.Modify.cs

@@ -44,15 +44,15 @@ public Logs? Modify
             SerializedMemberList gameObjectDiffs
         )
         {
-            return MainThread.Instance.Run(() =>
-            {
-                if (gameObjectRefs.Count == 0)
-                    throw new Exception("No GameObject references provided. Please provide at least one GameObject reference.");
+            if (gameObjectRefs.Count == 0)
+                throw new ArgumentException("No GameObject references provided. Please provide at least one GameObject reference.", nameof(gameObjectRefs));
 
-                if (gameObjectDiffs.Count != gameObjectRefs.Count)
-                    throw new Exception($"The number of {nameof(gameObjectDiffs)} and {nameof(gameObjectRefs)} should be the same. " +
-                        $"{nameof(gameObjectDiffs)}: {gameObjectDiffs.Count}, {nameof(gameObjectRefs)}: {gameObjectRefs.Count}");
+            if (gameObjectDiffs.Count != gameObjectRefs.Count)
+                throw new ArgumentException($"The number of {nameof(gameObjectDiffs)} and {nameof(gameObjectRefs)} should be the same. " +
+                    $"{nameof(gameObjectDiffs)}: {gameObjectDiffs.Count}, {nameof(gameObjectRefs)}: {gameObjectRefs.Count}", nameof(gameObjectDiffs));
 
+            return MainThread.Instance.Run(() =>
+            {
                 var logs = new Logs();
 
                 for (int i = 0; i < gameObjectRefs.Count; i++)