Merge pull request #578 from AlonTalmi/SourceGeneratorAddParametersSu…

…pport Fix withParameter not working (With code generation)
hadashiA · Nov 26, 2023 · 388ebd4 · 388ebd4 · vercel · Nov 26, 2023
2 parents 08e7862 + c794aff
commit 388ebd4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/VContainer.SourceGenerator/VContainerSourceGenerator.cs b/VContainer.SourceGenerator/VContainerSourceGenerator.cs
@@ -218,16 +218,16 @@ static bool TryEmitInjectMethod(
 
                 foreach (var fieldSymbol in typeMeta.InjectFields)
                 {
-                    var fieldTypeName =
-                        fieldSymbol.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
-                    codeWriter.AppendLine($"__x.{fieldSymbol.Name} = resolver.Resolve<{fieldTypeName}>();");
+                    var fieldTypeName = fieldSymbol.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+
+                    codeWriter.AppendLine($"__x.{fieldSymbol.Name} = ({fieldTypeName})resolver.ResolveOrParameter(typeof({fieldTypeName}), \"{fieldSymbol.Name}\", parameters);");
                 }
 
                 foreach (var propSymbol in typeMeta.InjectProperties)
                 {
-                    var propTypeName =
-                        propSymbol.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
-                    codeWriter.AppendLine($"__x.{propSymbol.Name} = resolver.Resolve<{propTypeName}>();");
+                    var propTypeName = propSymbol.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+
+                    codeWriter.AppendLine($"__x.{propSymbol.Name} = ({propTypeName})resolver.ResolveOrParameter(typeof({propTypeName}), \"{propSymbol.Name}\", parameters);");
                 }
 
                 foreach (var methodSymbol in typeMeta.InjectMethods)

diff --git a/VContainer/Assets/VContainer/Runtime/Internal/ReflectionInjector.cs b/VContainer/Assets/VContainer/Runtime/Internal/ReflectionInjector.cs
@@ -23,8 +23,8 @@ public static ReflectionInjector Build(Type type)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Inject(object instance, IObjectResolver resolver, IReadOnlyList<IInjectParameter> parameters)
         {
-            InjectFields(instance, resolver);
-            InjectProperties(instance, resolver);
+            InjectFields(instance, resolver, parameters);
+            InjectProperties(instance, resolver, parameters);
             InjectMethods(instance, resolver, parameters);
         }
 
@@ -56,26 +56,26 @@ public object CreateInstance(IObjectResolver resolver, IReadOnlyList<IInjectPara
             }
         }
 
-        void InjectFields(object obj, IObjectResolver resolver)
+        void InjectFields(object obj, IObjectResolver resolver, IReadOnlyList<IInjectParameter> parameters)
         {
             if (injectTypeInfo.InjectFields == null)
                 return;
 
             foreach (var x in injectTypeInfo.InjectFields)
             {
-                var fieldValue = resolver.Resolve(x.FieldType);
+                var fieldValue = resolver.ResolveOrParameter(x.FieldType, x.Name, parameters);
                 x.SetValue(obj, fieldValue);
             }
         }
 
-        void InjectProperties(object obj, IObjectResolver resolver)
+        void InjectProperties(object obj, IObjectResolver resolver, IReadOnlyList<IInjectParameter> parameters)
         {
             if (injectTypeInfo.InjectProperties == null)
                 return;
 
             foreach (var x in injectTypeInfo.InjectProperties)
             {
-                var propValue = resolver.Resolve(x.PropertyType);
+                var propValue = resolver.ResolveOrParameter(x.PropertyType, x.Name, parameters);
                 x.SetValue(obj, propValue);
             }
         }