diff --git a/src/Riok.Mapperly/MapperGenerator.cs b/src/Riok.Mapperly/MapperGenerator.cs index e505649c51..1b64b107ab 100644 --- a/src/Riok.Mapperly/MapperGenerator.cs +++ b/src/Riok.Mapperly/MapperGenerator.cs @@ -59,7 +59,10 @@ public void Initialize(IncrementalGeneratorInitializationContext context) .Select(static (x, _) => BuildDefaults(x.Left, x.Right)) .WithTrackingName(MapperGeneratorStepNames.BuildMapperDefaults); - var useStaticMappers = SyntaxProvider.GetUseStaticMapperDeclarations(context).Select(BuildStaticMappers); + var useStaticMappers = SyntaxProvider + .GetUseStaticMapperDeclarations(context) + .Select(BuildStaticMappers) + .WithTrackingName(MapperGeneratorStepNames.BuildUseStaticMappers); // extract the mapper declarations and build the descriptors var mappersAndDiagnostics = SyntaxProvider diff --git a/src/Riok.Mapperly/MapperGeneratorStepNames.cs b/src/Riok.Mapperly/MapperGeneratorStepNames.cs index ee46bc13bf..9dc4ed4276 100644 --- a/src/Riok.Mapperly/MapperGeneratorStepNames.cs +++ b/src/Riok.Mapperly/MapperGeneratorStepNames.cs @@ -4,6 +4,7 @@ public static class MapperGeneratorStepNames { public const string BuildCompilationContext = nameof(BuildCompilationContext); public const string BuildMapperDefaults = nameof(BuildMapperDefaults); + public const string BuildUseStaticMappers = nameof(BuildUseStaticMappers); public const string ReportDiagnostics = nameof(ReportDiagnostics); public const string BuildMappers = nameof(BuildMappers); } diff --git a/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorRunReasons.cs b/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorRunReasons.cs index 90b8aae048..e29476d99e 100644 --- a/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorRunReasons.cs +++ b/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorRunReasons.cs @@ -5,6 +5,7 @@ namespace Riok.Mapperly.Tests.Generator; internal record IncrementalGeneratorRunReasons( IncrementalStepRunReason CompilationStep, IncrementalStepRunReason BuildMapperDefaultsStep, + IncrementalStepRunReason BuildUseStaticMapperDefaultsStep, IncrementalStepRunReason BuildMappersStep, IncrementalStepRunReason ReportDiagnosticsStep ) @@ -13,6 +14,7 @@ IncrementalStepRunReason ReportDiagnosticsStep IncrementalStepRunReason.New, IncrementalStepRunReason.New, IncrementalStepRunReason.New, + IncrementalStepRunReason.New, IncrementalStepRunReason.New ); @@ -21,6 +23,7 @@ IncrementalStepRunReason ReportDiagnosticsStep IncrementalStepRunReason.Modified, IncrementalStepRunReason.Unchanged, IncrementalStepRunReason.Cached, + IncrementalStepRunReason.Cached, IncrementalStepRunReason.Cached ); diff --git a/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorTestHelper.cs b/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorTestHelper.cs index 19fdcb2742..1c12f732d5 100644 --- a/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorTestHelper.cs +++ b/test/Riok.Mapperly.Tests/Generator/IncrementalGeneratorTestHelper.cs @@ -35,6 +35,12 @@ public static void AssertRunReasons(GeneratorDriver driver, IncrementalGenerator // only assert for the first mapper AssertRunReason(runResult, MapperGeneratorStepNames.BuildCompilationContext, reasons.CompilationStep, mapperIndex); AssertRunReason(runResult, MapperGeneratorStepNames.BuildMapperDefaults, reasons.BuildMapperDefaultsStep, mapperIndex); + AssertRunReason( + runResult, + MapperGeneratorStepNames.BuildUseStaticMappers, + reasons.BuildUseStaticMapperDefaultsStep, + mapperIndex + ); } AssertRunReason(runResult, MapperGeneratorStepNames.ReportDiagnostics, reasons.ReportDiagnosticsStep, mapperIndex);