Merge pull request #17 from westermo/feature/support-old-syntax

Moved to using old syntax for Array creation to support older .net versions
westermo · May 24, 2024 · ae7bd86 · ae7bd86
2 parents a290ecb + c257aa0
commit ae7bd86
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/Benchmarking/Benchmarks/Program.cs b/Benchmarking/Benchmarks/Program.cs
@@ -1,4 +1,5 @@
 using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Engines;
 using BenchmarkDotNet.Running;
 using FactoryGenerator;
 using Inherited;
@@ -25,6 +26,9 @@ public class ResolveBenchmarks
     [Benchmark]
     public IOverridable ResolveTransient() => m_container.Resolve<IOverridable>();
 
+    [Benchmark]
+    public List<IRequestedArray> ResolveArray() => (List<IRequestedArray>) m_container.Resolve<IEnumerable<IRequestedArray>>();
+
     [Benchmark]
     public IContainer Create() => new DependencyInjectionContainer(default, default, default!);
 }

diff --git a/FactoryGenerator/FactoryGenerator.cs b/FactoryGenerator/FactoryGenerator.cs
@@ -145,6 +145,7 @@ private static IEnumerable<string> GenerateCode(ImmutableArray<Injection> dataIn
             log.Log(LogLevel.Debug, "Starting Code Generation");
             var usingStatements = $@"
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using FactoryGenerator;
 using System.CodeDom.Compiler;
@@ -583,25 +584,26 @@ public partial class {className}
         private static void MakeArray(Dictionary<string, string> declarations, string name, INamedTypeSymbol type,
                                       Dictionary<INamedTypeSymbol, List<Injection>> interfaceInjectors, bool function = false)
         {
-            var factoryName = "[]";
+            var factoryName = $"new {type}[0]";
             var factory = string.Empty;
             if (interfaceInjectors.TryGetValue(type, out var injections))
             {
                 factoryName = $"Create{name}()".Replace("_", "");
                 factory = @$"
-    {type}[] {factoryName}
+    IEnumerable<{type}> {factoryName}
     {{
-        {type}[] source = [{string.Join(", ", injections.Where(i => i.BooleanInjection == null).Select(i => i.Name))}];
-        {string.Join("\n\t\t\t", injections.Where(b => b.BooleanInjection != null)
-                                           .Select(i => $"if({i.BooleanInjection!.Key}) source = [..source, {i.Name}];"))}
+        List<{type}> source = new List<{type}> {{ 
+            {string.Join(",\n\t\t\t", injections.Where(i => i.BooleanInjection == null).Select(i => i.Name))} 
+        }};
+        {string.Join("\n\t\t\t", injections.Where(b => b.BooleanInjection != null).Select(i => $"if({i.BooleanInjection!.Key}) source.Add({i.Name});"))}
         return source;
     }}";
             }
 
             if (function)
             {
                 declarations[name] = $@"
-    internal {type}[] {name}()
+    internal IEnumerable<{type}> {name}()
     {{
         if (m_{name} != null)
             return m_{name};
@@ -613,12 +615,12 @@ private static void MakeArray(Dictionary<string, string> declarations, string na
             return m_{name} = {factoryName};
         }}
     }} 
-    internal {type}[]? m_{name};" + factory;
+    internal IEnumerable<{type}>? m_{name};" + factory;
             }
             else
             {
                 declarations[name] = $@"
-    internal {type}[] {name}
+    internal IEnumerable<{type}> {name}
     {{
         get
         {{
@@ -633,7 +635,7 @@ private static void MakeArray(Dictionary<string, string> declarations, string na
             }}
         }}
     }} 
-    internal {type}[]? m_{name};" + factory;
+    internal IEnumerable<{type}>? m_{name};" + factory;
             }
         }