Easier to read generated Class + Filenames (#1437)

thomhurst · Dec 20, 2024 · 203132e · 203132e
1 parent a08eb86
commit 203132e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/TUnit.Core.SourceGenerator/CodeGenerators/Helpers/FilenameSanitizer.cs b/TUnit.Core.SourceGenerator/CodeGenerators/Helpers/FilenameSanitizer.cs
@@ -9,6 +9,6 @@ public static string Sanitize(string filename)
             .Replace('.', '_')
             .Replace('-', '_');
 
-        return $"{sanitizedFilename}_{Guid.NewGuid():N}";
+        return $"{sanitizedFilename}";
     }
 }
diff --git a/TUnit.Core.SourceGenerator/CodeGenerators/TestHooksGenerator.cs b/TUnit.Core.SourceGenerator/CodeGenerators/TestHooksGenerator.cs
@@ -84,7 +84,7 @@ private void Generate(SourceProductionContext productionContext, IEnumerable<Hoo
     {
         foreach (var groupedByTypeName in hooks.GroupBy(x => x.MinimalTypeName))
         {
-            var className = FilenameSanitizer.Sanitize($"Hooks_{groupedByTypeName.Key}");
+            var className = $"Hooks_{groupedByTypeName.Key}";
 
             using var sourceBuilder = new SourceCodeWriter();
 
@@ -168,7 +168,7 @@ private void Generate(SourceProductionContext productionContext, IEnumerable<Hoo
 
             sourceBuilder.WriteLine("}");
 
-            productionContext.AddSource($"{className}.Generated.cs", sourceBuilder.ToString());
+            productionContext.AddSource($"{className}-{Guid.NewGuid():N}.Generated.cs", sourceBuilder.ToString());
         }
     }
 

diff --git a/TUnit.Core.SourceGenerator/CodeGenerators/TestsGenerator.cs b/TUnit.Core.SourceGenerator/CodeGenerators/TestsGenerator.cs
@@ -93,7 +93,7 @@ private void GenerateTests(SourceProductionContext context, TestCollectionDataMo
                      .TestSourceDataModels
                      .GroupBy(x => $"{prefix}{x.ClassNameToGenerate}"))
         {
-            var className = FilenameSanitizer.Sanitize(classGrouping.Key);
+            var className = classGrouping.Key;
             var count = classGrouping.Count();
 
             using var sourceBuilder = new SourceCodeWriter();
@@ -160,7 +160,7 @@ private void GenerateTests(SourceProductionContext context, TestCollectionDataMo
 
             sourceBuilder.WriteLine("}");
 
-            context.AddSource($"{className}.Generated.cs", sourceBuilder.ToString());
+            context.AddSource($"{className}-{Guid.NewGuid():N}.Generated.cs", sourceBuilder.ToString());
         }
     }
 }
diff --git a/TUnit.Core.SourceGenerator/Models/TestSourceDataModel.cs b/TUnit.Core.SourceGenerator/Models/TestSourceDataModel.cs
@@ -70,7 +70,7 @@ public override int GetHashCode()
     public required string AssemblyName { get; init; }
     public required string Namespace { get; init; }
 
-    public string ClassNameToGenerate => new string([..MinimalTypeName, '_', ..Namespace, '_', ..AssemblyName]).Replace('.', '_');
+    public string ClassNameToGenerate => MinimalTypeName;
 
     public string MethodVariablesWithCancellationToken()
     {