Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate matching IServiceProvider parameter name #11

Merged
merged 1 commit into from
Jun 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions ServiceScan.SourceGenerator.Tests/GeneratedMethodTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,46 @@ public static partial IServiceCollection AddServices(this IServiceCollection ser
Assert.Equal(expected, results.GeneratedTrees[1].ToString());
}

[Fact]
public void MethodWithCustomParameterName()
{
var compilation = CreateCompilation(Services,
"""
using ServiceScan.SourceGenerator;
using Microsoft.Extensions.DependencyInjection;

namespace GeneratorTests;

public static partial class ServicesExtensions
{
[GenerateServiceRegistrations(AssignableTo = typeof(IService))]
public static partial IServiceCollection AddServices(this IServiceCollection strangeServices);
}
""");

var results = CSharpGeneratorDriver
.Create(_generator)
.RunGenerators(compilation)
.GetRunResult();

var expected = """
using Microsoft.Extensions.DependencyInjection;

namespace GeneratorTests;

public static partial class ServicesExtensions
{
public static partial IServiceCollection AddServices(this IServiceCollection strangeServices)
{
return strangeServices
.AddTransient<GeneratorTests.IService, GeneratorTests.MyService>();
}
}
""";

Assert.Equal(expected, results.GeneratedTrees[1].ToString());
}

private static Compilation CreateCompilation(params string[] source)
{
var path = Path.GetDirectoryName(typeof(object).Assembly.Location)!;
Expand Down
4 changes: 2 additions & 2 deletions ServiceScan.SourceGenerator/DependencyInjectionGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ public void Initialize(IncrementalGeneratorInitializationContext context)

{{method.TypeModifiers}} class {{method.TypeName}}
{
{{method.MethodModifiers}} {{returnType}} {{method.MethodName}}({{(method.IsExtensionMethod ? "this" : "")}} IServiceCollection services)
{{method.MethodModifiers}} {{returnType}} {{method.MethodName}}({{(method.IsExtensionMethod ? "this" : "")}} IServiceCollection {{method.ParameterName}})
{
{{(method.ReturnsVoid ? "" : "return ")}}services
{{(method.ReturnsVoid ? "" : "return ")}}{{method.ParameterName}}
{{sb.ToString().Trim()}};
}
}
Expand Down
4 changes: 4 additions & 0 deletions ServiceScan.SourceGenerator/Model/MethodModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,22 @@ record MethodModel(
string TypeModifiers,
string MethodName,
string MethodModifiers,
string ParameterName,
bool IsExtensionMethod,
bool ReturnsVoid)
{
public static MethodModel Create(IMethodSymbol method, SyntaxNode syntax)
{
var parameterName = method.Parameters[0].Name;

return new MethodModel(
Namespace: method.ContainingNamespace.IsGlobalNamespace ? null : method.ContainingNamespace.ToDisplayString(),
TypeName: method.ContainingType.Name,
TypeMetadataName: method.ContainingType.ToFullMetadataName(),
TypeModifiers: GetModifiers(GetTypeSyntax(syntax)),
MethodName: method.Name,
MethodModifiers: GetModifiers(syntax),
ParameterName: parameterName,
IsExtensionMethod: method.IsExtensionMethod,
ReturnsVoid: method.ReturnsVoid);
}
Expand Down
Loading