Compare commits

...

3 Commits

  1. 10
      LightweightIocContainer.FactoryGenerator/FactoryGenerator.cs
  2. 2
      LightweightIocContainer.FactoryGenerator/LightweightIocContainer.FactoryGenerator.csproj
  3. 2
      LightweightIocContainer.Validation/LightweightIocContainer.Validation.csproj
  4. 2
      LightweightIocContainer/LightweightIocContainer.csproj

@ -101,7 +101,7 @@ public class FactoryGenerator : IIncrementalGenerator
private void GenerateFactory(SourceProductionContext context, ImmutableArray<ITypeSymbol?> types)
{
foreach (ITypeSymbol typeSymbol in GetDistinctTypes(types))
foreach (ITypeSymbol typeSymbol in GetDistinctTypes(types, true))
context.AddSource($"Generated{typeSymbol.Name}.g.cs", GenerateFactorySourceCode(typeSymbol));
}
@ -130,12 +130,10 @@ public class FactoryGenerator : IIncrementalGenerator
stringBuilder.AppendLine($"{INDENT}public TFactory Create<TFactory>(IocContainer container)");
stringBuilder.AppendLine($"{INDENT}{{");
foreach (ITypeSymbol type in GetDistinctTypes(types))
foreach (ITypeSymbol type in GetDistinctTypes(types, false))
{
stringBuilder.AppendLine($"{INDENT}{INDENT}if (typeof(TFactory) == typeof({GetTypeText(type, false)}))");
stringBuilder.AppendLine($"{INDENT}{INDENT}{{");
stringBuilder.AppendLine($"{INDENT}{INDENT}{INDENT}return (TFactory) (object) new Generated{GetTypeText(type, false)}(container);");
stringBuilder.AppendLine($"{INDENT}{INDENT}}}");
stringBuilder.AppendLine();
}
@ -255,7 +253,7 @@ public class FactoryGenerator : IIncrementalGenerator
return stringBuilder.ToString();
}
private IEnumerable<ITypeSymbol> GetDistinctTypes(ImmutableArray<ITypeSymbol?> types)
private IEnumerable<ITypeSymbol> GetDistinctTypes(ImmutableArray<ITypeSymbol?> types, bool distinctByName)
{
List<ITypeSymbol> distinctTypes = [];
foreach (ITypeSymbol? typeSymbol in types)
@ -266,7 +264,7 @@ public class FactoryGenerator : IIncrementalGenerator
if (distinctTypes.Contains(typeSymbol, SymbolEqualityComparer.IncludeNullability))
continue;
if (distinctTypes.Any(t => t.Name == typeSymbol.Name))
if (distinctByName && distinctTypes.Any(t => t.Name == typeSymbol.Name))
continue;
distinctTypes.Add(typeSymbol);

@ -12,7 +12,7 @@
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
<IsRoslynComponent>true</IsRoslynComponent>
<VersionPrefix>5.0.0</VersionPrefix>
<VersionSuffix>beta4</VersionSuffix>
<VersionSuffix>beta5</VersionSuffix>
</PropertyGroup>
<PropertyGroup>

@ -11,7 +11,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<DocumentationFile>LightweightIocContainer.Validation.xml</DocumentationFile>
<VersionPrefix>5.0.0</VersionPrefix>
<VersionSuffix>beta4</VersionSuffix>
<VersionSuffix>beta5</VersionSuffix>
</PropertyGroup>
<PropertyGroup>

@ -11,7 +11,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<DocumentationFile>LightweightIocContainer.xml</DocumentationFile>
<VersionPrefix>5.0.0</VersionPrefix>
<VersionSuffix>beta4</VersionSuffix>
<VersionSuffix>beta5</VersionSuffix>
</PropertyGroup>
<PropertyGroup>

Loading…
Cancel
Save