Merge pull request #6 from westermo/feature/DefaultSelf

Assume [Self] when no interface is present, and allow interface injections to be composite
westermo · Apr 3, 2024 · ce72e10 · ce72e10
2 parents 9e21234 + 7d919fe
commit ce72e10
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/FactoryGenerator/Injection.cs b/FactoryGenerator/Injection.cs
@@ -177,6 +177,15 @@ private Injection(INamedTypeSymbol type, ImmutableArray<INamedTypeSymbol> interf
 
             var singleInstance = false;
             var acquireChildInterfaces = false;
+            var asSelf = false;
+            if(namedTypeSymbol.Interfaces.Length == 0)
+            {
+                asSelf = true;
+            }
+            if (namedTypeSymbol.TypeKind == TypeKind.Interface)
+            {
+                asSelf = true;
+            }
             BooleanInjection? boolean = null;
             HashSet<INamedTypeSymbol> attributedInterfaces = new(SymbolEqualityComparer.Default);
             HashSet<INamedTypeSymbol> preventedInterfaces = new(SymbolEqualityComparer.Default);
@@ -207,7 +216,7 @@ private Injection(INamedTypeSymbol type, ImmutableArray<INamedTypeSymbol> interf
 
                         break;
                     case "SelfAttribute":
-                        attributedInterfaces.Add(namedTypeSymbol);
+                        asSelf = true;
                         break;
                     case "BooleanAttribute":
                         boolean = HandleBoolean(attributeData);
@@ -218,9 +227,9 @@ private Injection(INamedTypeSymbol type, ImmutableArray<INamedTypeSymbol> interf
             }
 
             var interfaces = acquireChildInterfaces ? namedTypeSymbol.AllInterfaces : namedTypeSymbol.Interfaces;
-            if (namedTypeSymbol.TypeKind == TypeKind.Interface)
+            if (asSelf)
             {
-                interfaces = ImmutableArray.Create(namedTypeSymbol);
+                interfaces = interfaces.Add(namedTypeSymbol);
             }
 
             interfaces = interfaces.AddRange(attributedInterfaces);