Handle injiection point exception

mewlist · Feb 21, 2024 · dd5143f · dd5143f
1 parent 166bc6d
commit dd5143f
Showing 1 changed file with 31 additions and 6 deletions.
diff --git a/Runtime/DIContainer.cs b/Runtime/DIContainer.cs
@@ -186,9 +186,22 @@ private async ValueTask<object> InstantiateInternalAsync(Type targetType, object
             AfterInjectionProcessingScope.Begin();
 
             var target = await ConstructorInjector.DoInject(targetType, args, scopedInstances);
-            var targetMethodsInfo = GetTargetMethodInfo(targetType);
-            var targetPropertiesInfo = GetTargetPropertyInfo(targetType);
-            var targetFieldsInfo = GetTargetFieldInfo(targetType);
+
+            TargetMethodsInfo targetMethodsInfo;
+            TargetPropertiesInfo targetPropertiesInfo;
+            TargetFieldsInfo targetFieldsInfo;
+            try
+            {
+                targetMethodsInfo = GetTargetMethodInfo(targetType);
+                targetPropertiesInfo = GetTargetPropertyInfo(targetType);
+                targetFieldsInfo = GetTargetFieldInfo(targetType);
+            }
+            catch (Exception e)
+            {
+                InjectionProcessingScope.End();
+                AfterInjectionProcessingScope.End();
+                throw new FailedToInjectException(target, e);
+            }
 
             try
             {
@@ -275,9 +288,21 @@ private async ValueTask InjectIntoInternalAsync<T>(T target, object[] args, Scop
             AfterInjectionProcessingScope.Begin();
 
             var targetType = target.GetType();
-            var targetMethodsInfo = GetTargetMethodInfo(targetType);
-            var targetPropertiesInfo = GetTargetPropertyInfo(targetType);
-            var targetFieldsInfo = GetTargetFieldInfo(targetType);
+            TargetMethodsInfo targetMethodsInfo;
+            TargetPropertiesInfo targetPropertiesInfo;
+            TargetFieldsInfo targetFieldsInfo;
+            try
+            {
+                targetMethodsInfo = GetTargetMethodInfo(targetType);
+                targetPropertiesInfo = GetTargetPropertyInfo(targetType);
+                targetFieldsInfo = GetTargetFieldInfo(targetType);
+            }
+            catch (Exception e)
+            {
+                InjectionProcessingScope.End();
+                AfterInjectionProcessingScope.End();
+                throw new FailedToInjectException(target, e);
+            }
 
             try
             {