Clean up MethodParentDeclaration creation

zompinc · Jul 8, 2024 · b4d4eb9 · b4d4eb9
1 parent 702ed51
commit b4d4eb9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 59 deletions.
diff --git a/.vscode/spellright.dict b/.vscode/spellright.dict
@@ -1,5 +1,6 @@
 awaitable
 codecov
+equatable
 extensi
 impl
 func

diff --git a/src/Zomp.SyncMethodGenerator/MethodParentDeclaration.cs b/src/Zomp.SyncMethodGenerator/MethodParentDeclaration.cs
@@ -4,8 +4,19 @@
 /// Represents a class a <see cref="MethodToGenerate"/> belongs to.
 /// </summary>
 /// <param name="MethodParent">Type of container.</param>
-/// <param name="ClassOrStructKeyword">Indicates whether struct or class are explicitly specified for a record.</param>
 /// <param name="ParentName">Class name.</param>
 /// <param name="Modifiers">A list of modifiers.</param>
 /// <param name="TypeParameterListSyntax">A list of type parameters.</param>
-internal sealed record MethodParentDeclaration(MethodParent MethodParent, SyntaxToken ClassOrStructKeyword, string ParentName, EquatableArray<ushort> Modifiers, EquatableArray<string> TypeParameterListSyntax);
+/// <param name="ClassOrStructKeyword">Indicates whether struct or class are explicitly specified for a record.</param>
+internal sealed record MethodParentDeclaration(MethodParent MethodParent, string ParentName, EquatableArray<ushort> Modifiers, EquatableArray<string> TypeParameterListSyntax, SyntaxToken ClassOrStructKeyword)
+{
+    public MethodParentDeclaration(MethodParent methodParent, SyntaxToken parentName, SyntaxTokenList modifiers, TypeParameterListSyntax? typeParameterList, SyntaxToken classOrStructKeyword = default)
+        : this(
+            methodParent,
+            parentName.ValueText,
+            modifiers.Select(z => (ushort)z.RawKind).Where(z => z != (ushort)SyntaxKind.PartialKeyword).ToImmutableArray(),
+            (typeParameterList is null ? [] : typeParameterList.Parameters.Select(z => z.Identifier.ValueText)).ToImmutableArray(),
+            classOrStructKeyword)
+    {
+    }
+}
diff --git a/src/Zomp.SyncMethodGenerator/SyncMethodSourceGenerator.cs b/src/Zomp.SyncMethodGenerator/SyncMethodSourceGenerator.cs
@@ -143,68 +143,21 @@ static string BuildClassName(MethodParentDeclaration c)
         while (node.Parent is not null)
         {
             node = node.Parent;
-            SyntaxTokenList originalModifiers;
-            SyntaxToken identifier;
-            SyntaxToken classOrStructKeyword = default;
-            TypeParameterListSyntax? typeParameterList;
-            MethodParent methodParent;
-            if (node is ClassDeclarationSyntax classSyntax)
+            MethodParentDeclaration? mpd = node switch
             {
-                originalModifiers = classSyntax.Modifiers;
-                typeParameterList = classSyntax.TypeParameterList;
-                identifier = classSyntax.Identifier;
-                methodParent = MethodParent.Class;
-            }
-            else if (node is StructDeclarationSyntax structSyntax)
-            {
-                originalModifiers = structSyntax.Modifiers;
-                typeParameterList = structSyntax.TypeParameterList;
-                identifier = structSyntax.Identifier;
-                methodParent = MethodParent.Struct;
-            }
-            else if (node is RecordDeclarationSyntax recordSyntax)
-            {
-                originalModifiers = recordSyntax.Modifiers;
-                typeParameterList = recordSyntax.TypeParameterList;
-                identifier = recordSyntax.Identifier;
-                methodParent = MethodParent.Record;
-                classOrStructKeyword = recordSyntax.ClassOrStructKeyword;
-            }
-            else if (node is InterfaceDeclarationSyntax idx)
-            {
-                originalModifiers = idx.Modifiers;
-                typeParameterList = idx.TypeParameterList;
-                identifier = idx.Identifier;
-                methodParent = MethodParent.Interface;
-            }
-            else
+                ClassDeclarationSyntax o => new(MethodParent.Class, o.Identifier, o.Modifiers, o.TypeParameterList),
+                StructDeclarationSyntax o => new(MethodParent.Struct, o.Identifier, o.Modifiers, o.TypeParameterList),
+                RecordDeclarationSyntax o => new(MethodParent.Record, o.Identifier, o.Modifiers, o.TypeParameterList, o.ClassOrStructKeyword),
+                InterfaceDeclarationSyntax o => new(MethodParent.Interface, o.Identifier, o.Modifiers, o.TypeParameterList),
+                _ => null,
+            };
+
+            if (mpd is null)
             {
                 break;
             }
 
-            ////var modifiers = classSyntax?.Modifiers ?? structSyntax.Modifiers;
-
-            var modifiers = ImmutableArray.CreateBuilder<ushort>();
-
-            foreach (var mod in originalModifiers)
-            {
-                var kind = mod.RawKind;
-                if (kind == (int)SyntaxKind.PartialKeyword)
-                {
-                    continue;
-                }
-
-                modifiers.Add((ushort)kind);
-            }
-
-            var typeParameters = ImmutableArray.CreateBuilder<string>();
-
-            foreach (var typeParameter in typeParameterList?.Parameters ?? default)
-            {
-                typeParameters.Add(typeParameter.Identifier.ValueText);
-            }
-
-            classes.Insert(0, new(methodParent, classOrStructKeyword, identifier.ValueText, modifiers.ToImmutable(), typeParameters.ToImmutable()));
+            classes.Insert(0, mpd);
         }
 
         if (classes.Count == 0)