Use interpolation over string concat and join

polyadic · Sep 25, 2024 · 920725b · 920725b
1 parent 1334c9d
commit 920725b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Funcky.DiscriminatedUnion.SourceGeneration/Emitter.cs b/Funcky.DiscriminatedUnion.SourceGeneration/Emitter.cs
@@ -173,10 +173,10 @@ private static void WriteJsonDerivedTypeAttribute(IndentedTextWriter writer, Dis
     }
 
     private static CollectingInterpolatedStringHandler FormatMatchMethodDeclaration(string genericTypeName, IEnumerable<DiscriminatedUnionVariant> variants)
-        => $"{genericTypeName} Match<{genericTypeName}>({string.Join(", ", variants.Select(variant => $"global::System.Func<{variant.LocalTypeName}, {genericTypeName}> {FormatIdentifier(variant.ParameterName)}"))})";
+        => $"{genericTypeName} Match<{genericTypeName}>({variants.JoinToInterpolation(v => $"global::System.Func<{v.LocalTypeName}, {genericTypeName})> {FormatIdentifier(v.ParameterName)}", ", ")})";
 
     private static string FormatSwitchMethodDeclaration(IEnumerable<DiscriminatedUnionVariant> variants)
-        => $"void Switch({string.Join(", ", variants.Select(variant => $"global::System.Action<{variant.LocalTypeName}> {FormatIdentifier(variant.ParameterName)}"))})";
+        => $"void Switch({variants.JoinToInterpolation(v => $"global::System.Action<{v.LocalTypeName}> {FormatIdentifier(v.ParameterName)}", ", "))})";
 
     private static CollectingInterpolatedStringHandler FormatPartialTypeDeclaration(TypeDeclarationSyntax typeDeclaration)
         => typeDeclaration is RecordDeclarationSyntax recordDeclaration
@@ -186,8 +186,8 @@ private static CollectingInterpolatedStringHandler FormatPartialTypeDeclaration(
     private static CollectingInterpolatedStringHandler CombineTokens(params object[] tokens)
         => tokens.Select(t => t.ToString()).Where(t => !string.IsNullOrEmpty(t)).JoinToInterpolation(" ");
 
-    private static string FormatIdentifier(string identifier)
-        => IsIdentifier(identifier) ? '@' + identifier : identifier;
+    private static CollectingInterpolatedStringHandler FormatIdentifier(string identifier)
+        => $"{(IsIdentifier(identifier) ? "@" : string.Empty)}{identifier}";
 
     private static bool IsIdentifier(string identifier)
         => SyntaxFacts.GetKeywordKind(identifier) != SyntaxKind.None;