Refactor CodeBuilder

Author: aalmada

NetFabric.Hyperlinq.UnitTests/GenerateSourceTests.cs

@@ -131,13 +131,18 @@ public async Task GenerateSourceShouldGenerate(string[] paths, string expected)
                 .ToList();
 
             // Act
-            var builder = new CodeBuilder(isUnitTest: true);
+            var builder = new CodeBuilder { IsUnitTest = true };
             Generator.GenerateSource(compilation, typeSymbolsCache, memberAccessExpressions, builder, CancellationToken.None);
             var result = builder.ToString();
 
             // Assert
+#if NET5_0_OR_GREATER            
+            _ = result.Must()
+                .BeEqualTo(await File.ReadAllTextAsync(expected));
+#else
             _ = result.Must()
                 .BeEqualTo(File.ReadAllText(expected));
+#endif
         }
     }
 }

NetFabric.Hyperlinq.UnitTests/NetFabric.Hyperlinq.UnitTests.csproj

@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Ben.TypeDictionary" Version="0.1.4" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.11.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.11.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="NetFabric.Assertive" Version="4.0.0" />

NetFabric.Hyperlinq/NetFabric.Hyperlinq.csproj

@@ -48,7 +48,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

NetFabric.Hyperlinq/Utils/CodeBuilder.cs

@@ -7,18 +7,12 @@ namespace NetFabric.Hyperlinq.SourceGenerator
 {
     class CodeBuilder
     {
-        static readonly string indentation = "    ";
-
-        static readonly string assemblyName = typeof(CodeBuilder).Assembly.GetName().Name;
-        static readonly string assemblyVersion = typeof(CodeBuilder).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? string.Empty;
+        const string indentation = "    ";
 
         readonly StringBuilder builder = new();
         int currentLevel = 0;
 
-        public CodeBuilder(bool isUnitTest = false)
-            => IsUnitTest = isUnitTest;
-        
-        public bool IsUnitTest { get; }
+        public bool IsUnitTest { get; init; } = false;
 
         StringBuilder Indent()
         {
@@ -85,14 +79,6 @@ public void Dispose()
             }
         }
 
-        public CodeBuilder AppendGeneratedCodeMethodAttributes()
-            => IsUnitTest 
-                ? this // do nothing
-                : AppendLine($"[GeneratedCode(\"{assemblyName}\", \"{(IsUnitTest ? "0.0.0" : assemblyVersion)}\")]")
-                    .AppendLine("[DebuggerNonUserCode]")
-                    .AppendLine("[ExcludeFromCodeCoverage]")
-                    .AppendLine("[EditorBrowsable(EditorBrowsableState.Never)]");
-
         public override string ToString() 
             => builder.ToString();
     }

NetFabric.Hyperlinq/Utils/CodeBuilderExtensions.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Reflection;
+
+namespace NetFabric.Hyperlinq.SourceGenerator
+{
+    static class CodeBuilderExtensions
+    {
+        static readonly string assemblyName = typeof(CodeBuilder).Assembly
+            .GetName().Name;
+        static readonly string assemblyVersion = typeof(CodeBuilder).Assembly
+            .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion 
+            ?? string.Empty;
+
+        public static CodeBuilder AppendGeneratedCodeMethodAttributes(this CodeBuilder builder)
+            => builder.IsUnitTest 
+                ? builder // do nothing
+                : builder.AppendLine($"[GeneratedCode(\"{assemblyName}\", \"{assemblyVersion}\")]")
+                    .AppendLine("[DebuggerNonUserCode]")
+                    .AppendLine("[ExcludeFromCodeCoverage]")
+                    .AppendLine("[EditorBrowsable(EditorBrowsableState.Never)]");
+    }
+}