tuple → record

Author: ufcpp

src/StringLiteralGenerator/ReservedAttributes.cs

@@ -0,0 +1,3 @@
+namespace System.Runtime.CompilerServices;
+
+internal class IsExternalInit { }

src/StringLiteralGenerator/TypeInfo.cs

@@ -4,6 +4,13 @@ namespace StringLiteralGenerator;
 
 public partial class Utf8StringLiteralGenerator
 {
+    private record Utf8LiteralMethod(TypeInfo Type, MethodInfo Method)
+    {
+        public Utf8LiteralMethod(IMethodSymbol m, string text)
+            : this(new TypeInfo(m.ContainingType), new MethodInfo(m, text))
+        { }
+    }
+
     private record struct TypeInfo(string? Namespace, string Name)
     {
         public TypeInfo(INamedTypeSymbol t)
@@ -24,3 +31,4 @@ public MethodInfo(IMethodSymbol m, string text)
         { }
     }
 }
+

src/StringLiteralGenerator/Utf8StringLiteralGenerator.Parser.cs

@@ -1,4 +1,5 @@
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace StringLiteralGenerator;
@@ -10,6 +11,17 @@ public partial class Utf8StringLiteralGenerator : ISourceGenerator
     private static bool IsSyntaxTargetForGeneration(SyntaxNode node) =>
         node is MethodDeclarationSyntax { AttributeLists.Count: > 0 };
 
+    private static Utf8LiteralMethod? GetSemanticTargetForGeneration(SemanticModel semanticModel, MethodDeclarationSyntax m)
+    {
+        if (m.ParameterList.Parameters.Count != 0) return null;
+        if (semanticModel.GetDeclaredSymbol(m) is not { } methodSymbol) return null;
+        if (!methodSymbol.IsPartialDefinition || !methodSymbol.IsStatic) return null;
+        if (!ReturnsString(methodSymbol)) return null;
+        if (GetUtf8Attribute(methodSymbol) is not { } value) return null;
+
+        return new(methodSymbol, value);
+    }
+
     static bool ReturnsString(IMethodSymbol methodSymbol)
     {
         return methodSymbol.ReturnType is INamedTypeSymbol s

src/StringLiteralGenerator/Utf8StringLiteralGenerator.cs

@@ -1,5 +1,4 @@
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Text;
 using System.Collections.Generic;
@@ -19,7 +18,7 @@ public void Execute(GeneratorExecutionContext context)
 
         var buffer = new StringBuilder();
 
-        var group = enumerate().GroupBy(x => x.type, x => x.method);
+        var group = enumerate().GroupBy(x => x.Type, x => x.Method);
 
         foreach (var g in group)
         {
@@ -29,19 +28,14 @@ public void Execute(GeneratorExecutionContext context)
             context.AddSource(filename, SourceText.From(generatedSource, Encoding.UTF8));
         }
 
-        IEnumerable<(TypeInfo type, MethodInfo method)> enumerate()
+        IEnumerable<Utf8LiteralMethod> enumerate()
         {
             foreach (var m in receiver.CandidateMethods)
             {
                 var model = compilation.GetSemanticModel(m.SyntaxTree);
 
-                if (m.ParameterList.Parameters.Count != 0) continue;
-                if (model.GetDeclaredSymbol(m) is not { } methodSymbol) continue;
-                if (!methodSymbol.IsPartialDefinition || !methodSymbol.IsStatic) continue;
-                if (!ReturnsString(methodSymbol)) continue;
-                if (GetUtf8Attribute(methodSymbol) is not { } value) continue;
-
-                yield return (new(methodSymbol.ContainingType), new(methodSymbol, value));
+                if (GetSemanticTargetForGeneration(model, m) is { } t)
+                    yield return t;
             }
         }
     }