Refactor and rename command generators for clarity

Renamed `CommandImplGenerator` to `SystemCommandlineGenerator` and introduced an abstract `CommandBaseGenerator` for better extensibility. Moved source generation logic to the new `SystemCommandlineGenerator` and updated related tests accordingly.

Author: arturcic

new-cli/GitVersion.Cli.Generator.Tests/CommandImplGeneratorTests.cs renamed to new-cli/GitVersion.Cli.Generator.Tests/SystemCommandlineGeneratorTests.cs

@@ -6,7 +6,7 @@
 
 namespace GitVersion.Cli.Generator.Tests;
 
-public class CommandImplGeneratorTests
+public class SystemCommandlineGeneratorTests
 {
     /*language=cs*/
     private const string TestCommandSourceCode =
@@ -140,8 +140,8 @@ private void AddCommand(ICommandImpl command, IDictionary<string, ICommandImpl>
     [Test]
     public async Task ValidateGeneratedCommandImplementation()
     {
-        var generatorType = typeof(CommandImplGenerator);
-        var sourceGeneratorTest = new CSharpSourceGeneratorTest<CommandImplGenerator, DefaultVerifier>
+        var generatorType = typeof(SystemCommandlineGenerator);
+        var sourceGeneratorTest = new CSharpSourceGeneratorTest<SystemCommandlineGenerator, DefaultVerifier>
         {
             TestState =
             {

new-cli/GitVersion.Cli.Generator/CommandImplGenerator.cs renamed to new-cli/GitVersion.Cli.Generator/CommandBaseGenerator.cs

@@ -1,15 +1,10 @@
 using GitVersion.Polyfill;
 
-// ReSharper disable InconsistentNaming
 namespace GitVersion;
 
-[Generator(LanguageNames.CSharp)]
-public class CommandImplGenerator : IIncrementalGenerator
+public abstract class CommandBaseGenerator : IIncrementalGenerator
 {
-    private const string GeneratedNamespaceName = "GitVersion.Generated";
     private const string InfraNamespaceName = "GitVersion";
-    private const string DependencyInjectionNamespaceName = "GitVersion.Infrastructure";
-    private const string CommandNamespaceName = "GitVersion.Commands";
     private const string CommandInterfaceFullName = $"{InfraNamespaceName}.ICommand<T>";
     private const string CommandAttributeFullName = $"{InfraNamespaceName}.CommandAttribute";
     private const string CommandAttributeGenericFullName = $"{InfraNamespaceName}.CommandAttribute<T>";
@@ -22,6 +17,8 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
         context.RegisterImplementationSourceOutput(commandTypes, GenerateSourceCode);
     }
 
+    internal abstract void GenerateSourceCode(SourceProductionContext context, ImmutableArray<CommandInfo?> commandInfos);
+
     private static ImmutableArray<CommandInfo?> SelectCommandTypes(Compilation compilation, CancellationToken ct)
     {
         ct.ThrowIfCancellationRequested();
@@ -38,43 +35,7 @@ static bool SearchQuery(INamedTypeSymbol typeSymbol)
             return attributeData is not null;
         }
     }
-    private static void GenerateSourceCode(SourceProductionContext context, ImmutableArray<CommandInfo?> commandInfos)
-    {
-        foreach (var commandInfo in commandInfos)
-        {
-            if (commandInfo == null)
-                continue;
-
-            var commandHandlerTemplate = Template.Parse(Content.CommandImplContent);
-
-            var commandHandlerSource = commandHandlerTemplate.Render(new
-            {
-                Model = commandInfo,
-                Namespace = GeneratedNamespaceName
-            }, member => member.Name);
 
-            context.AddSource($"{commandInfo.CommandTypeName}Impl.g.cs", string.Join("\n", commandHandlerSource));
-        }
-
-        var commandHandlersModuleTemplate = Template.Parse(Content.CommandsModuleContent);
-        var commandHandlersModuleSource = commandHandlersModuleTemplate.Render(new
-        {
-            Model = commandInfos,
-            Namespace = GeneratedNamespaceName,
-            InfraNamespaceName,
-            DependencyInjectionNamespaceName,
-            CommandNamespaceName
-        }, member => member.Name);
-        context.AddSource("CommandsModule.g.cs", string.Join("\n", commandHandlersModuleSource));
-
-        var rootCommandHandlerTemplate = Template.Parse(Content.RootCommandImplContent);
-        var rootCommandHandlerSource = rootCommandHandlerTemplate.Render(new
-        {
-            Namespace = GeneratedNamespaceName,
-            InfraNamespaceName
-        }, member => member.Name);
-        context.AddSource("RootCommandImpl.g.cs", string.Join("\n", rootCommandHandlerSource));
-    }
     private static CommandInfo? MapToCommandInfo(ITypeSymbol classSymbol, CancellationToken ct)
     {
         ct.ThrowIfCancellationRequested();

new-cli/GitVersion.Cli.Generator/SystemCommandlineGenerator.cs

@@ -0,0 +1,48 @@
+namespace GitVersion;
+
+[Generator(LanguageNames.CSharp)]
+public class SystemCommandlineGenerator : CommandBaseGenerator
+{
+    private const string GeneratedNamespaceName = "GitVersion.Generated";
+    private const string InfraNamespaceName = "GitVersion";
+    private const string DependencyInjectionNamespaceName = "GitVersion.Infrastructure";
+    private const string CommandNamespaceName = "GitVersion.Commands";
+
+    internal override void GenerateSourceCode(SourceProductionContext context, ImmutableArray<CommandInfo?> commandInfos)
+    {
+        foreach (var commandInfo in commandInfos)
+        {
+            if (commandInfo == null)
+                continue;
+
+            var commandHandlerTemplate = Template.Parse(Content.CommandImplContent);
+
+            var commandHandlerSource = commandHandlerTemplate.Render(new
+            {
+                Model = commandInfo,
+                Namespace = GeneratedNamespaceName
+            }, member => member.Name);
+
+            context.AddSource($"{commandInfo.CommandTypeName}Impl.g.cs", string.Join("\n", commandHandlerSource));
+        }
+
+        var commandHandlersModuleTemplate = Template.Parse(Content.CommandsModuleContent);
+        var commandHandlersModuleSource = commandHandlersModuleTemplate.Render(new
+        {
+            Model = commandInfos,
+            Namespace = GeneratedNamespaceName,
+            InfraNamespaceName,
+            DependencyInjectionNamespaceName,
+            CommandNamespaceName
+        }, member => member.Name);
+        context.AddSource("CommandsModule.g.cs", string.Join("\n", commandHandlersModuleSource));
+
+        var rootCommandHandlerTemplate = Template.Parse(Content.RootCommandImplContent);
+        var rootCommandHandlerSource = rootCommandHandlerTemplate.Render(new
+        {
+            Namespace = GeneratedNamespaceName,
+            InfraNamespaceName
+        }, member => member.Name);
+        context.AddSource("RootCommandImpl.g.cs", string.Join("\n", rootCommandHandlerSource));
+    }
+}