Source gen improvements

shinyorg · Jun 10, 2024 · db53665 · db53665
1 parent b17d910
commit db53665
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/src/Shiny.Mediator.Maui/Shiny.Mediator.Maui.csproj b/src/Shiny.Mediator.Maui/Shiny.Mediator.Maui.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.40" />
+        <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.10" />
         <ProjectReference Include="..\Shiny.Mediator\Shiny.Mediator.csproj" />
     </ItemGroup>
 

diff --git a/src/Shiny.Mediator.SourceGenerators/MediatorSourceGenerator.cs b/src/Shiny.Mediator.SourceGenerators/MediatorSourceGenerator.cs
@@ -57,7 +57,15 @@ public void Execute(GeneratorExecutionContext context)
 
         var nameSpace = context.GetMSBuildProperty("RootNamespace") ?? context.Compilation.AssemblyName;
         var assName = context.Compilation.AssemblyName?.Replace(".", "_");
-
+        var classes = this.syntaxReceiver
+            .Classes
+            .Select(x => x.ToDisplayString())
+            .Distinct()
+            .ToList();
+
+        if (!classes.Any())
+            return;
+
         var sb = new StringBuilder();
         sb
             .AppendLine($"namespace {nameSpace};")
@@ -66,7 +74,7 @@ public void Execute(GeneratorExecutionContext context)
             .AppendLine($"\tpublic static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddDiscoveredMediatorHandlersFrom{assName}(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services)")
             .AppendLine("\t{");
 
-        var classes = this.syntaxReceiver.Classes.Select(x => x.ToDisplayString()).Distinct();
+
         foreach (var cls in classes)
             sb.AppendLine($"\t\tservices.AddSingletonAsImplementedInterfaces<{cls}>();");
 

diff --git a/src/Shiny.Mediator.SourceGenerators/RegisterHandlerAttributeSyntaxReceiver.cs b/src/Shiny.Mediator.SourceGenerators/RegisterHandlerAttributeSyntaxReceiver.cs
@@ -1,3 +1,4 @@
+using System;
 using Microsoft.CodeAnalysis;
 using SourceGeneratorsKit;
 
@@ -10,6 +11,9 @@ public class RegisterHandlerAttributeSyntaxReceiver : SyntaxReceiver
 
     protected override bool ShouldCollectClassSymbol(INamedTypeSymbol classSymbol)
     {
+        if (classSymbol.ContainingAssembly.Name.StartsWith("Shiny.Mediator", StringComparison.CurrentCultureIgnoreCase))
+            return false;
+
         var hasAttribute = classSymbol.HasAttribute("RegisterHandlerAttribute");
         if (hasAttribute)
             return true;

diff --git a/tests/Shiny.Mediator.Tests/Shiny.Mediator.Tests.csproj b/tests/Shiny.Mediator.Tests/Shiny.Mediator.Tests.csproj
@@ -5,6 +5,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+        <AssemblyName>UnitTests</AssemblyName>
         <!--<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GF</CompilerGeneratedFilesOutputPath>-->
 <!--        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>-->
 <!--        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>-->

diff --git a/tests/Shiny.Mediator.Tests/SourceGeneratorTests.cs b/tests/Shiny.Mediator.Tests/SourceGeneratorTests.cs
@@ -10,7 +10,7 @@ public void DidRegister()
     {
         var services = new ServiceCollection();
         services.AddShinyMediator();
-        services.AddDiscoveredMediatorHandlersFromShiny_Mediator_Tests();
+        services.AddDiscoveredMediatorHandlersFromUnitTests(); // assembly name changed to get around assembly name (Shiny.Mediator) detection
         var sp = services.BuildServiceProvider();
 
         sp.GetService<IEventHandler<SourceGenEvent>>().Should().NotBeNull("Event Handler not found");