Merge pull request #660 from NordlightPer/fix/set_prefab_back_to_acti…

…ve_on_exception

Added test and fix for when a game object throws during instantiation

VContainer/Assets/Tests/Unity/Fixtures/CrashingSampleMonoBehaviour.cs

@@ -0,0 +1,29 @@
+using System;
+using UnityEngine;
+
+namespace VContainer.Tests.Unity
+{
+
+    public sealed class CrashingSampleMonoBehaviour : MonoBehaviour, IComponent
+    {
+        public ServiceA ServiceA;
+        public ServiceA ServiceAInAwake;
+        public bool StartCalled;
+        public int UpdateCalls;
+
+        void Start() => StartCalled = true;
+        void Update() => UpdateCalls += 1;
+
+        void Awake()
+        {
+            ServiceAInAwake = ServiceA;
+        }
+
+        [Inject]
+        public void Construct(ServiceA serviceA)
+        {
+            ServiceA = serviceA;
+            throw new Exception("Something broke during construct");
+        }
+    }
+}

VContainer/Assets/Tests/Unity/UnityObjectResolverTest.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 using NUnit.Framework;
 using UnityEngine;
 using VContainer.Unity;
@@ -141,6 +142,22 @@ void AssertInstantiatedInstance(SampleMonoBehaviour instance)
                 Assert.That(instance.ServiceA, Is.InstanceOf<ServiceA>());
             }
         }
+
+        [Test]
+        public void WhenFailingDuringInstantiateGameObject_TheGameObjectIsStillEnabled()
+        {
+            var builder = new ContainerBuilder();
+            builder.Register<ServiceA>(Lifetime.Singleton);
+            var container = builder.Build();
+
+            var parent = new GameObject("Parent");
+            GameObject original = new GameObject("Original");
+            original.AddComponent<CrashingSampleMonoBehaviour>();
+
+            Assert.Catch(() => container.Instantiate(original, parent.transform));
+
+            Assert.That(original.gameObject.activeSelf, Is.True);
+        }
 
         [Test]
         public void Instantiate_ExceptionThrownDuringInjection_PrefabIsStillEnabled()

VContainer/Assets/VContainer/Runtime/Unity/ObjectResolverUnityExtensions.cs

@@ -183,14 +183,18 @@ public static GameObject Instantiate(this IObjectResolver resolver, GameObject p
             var wasActive = prefab.activeSelf;
             prefab.SetActive(false);
 
-            var instance = UnityEngine.Object.Instantiate(prefab, parent, worldPositionStays);
-            SetName(instance, prefab);
-
-            resolver.InjectGameObject(instance);
-
-            prefab.SetActive(wasActive);
-            instance.SetActive(wasActive);
-
+            GameObject instance = null;
+            try
+            {
+                instance = UnityEngine.Object.Instantiate(prefab, parent, worldPositionStays);
+                SetName(instance, prefab);
+                resolver.InjectGameObject(instance);
+            }
+            finally
+            {
+                prefab.SetActive(wasActive);
+                instance?.SetActive(wasActive);    
+            }
             return instance;
         }