Add support for nested record types

Author: Sergio0694

CommunityToolkit.Mvvm.SourceGenerators/Models/HierarchyInfo.cs

@@ -40,7 +40,8 @@ public static HierarchyInfo From(INamedTypeSymbol typeSymbol)
         {
             hierarchy.Add(new TypeInfo(
                 parent.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat),
-                parent.TypeKind));
+                parent.TypeKind,
+                parent.IsRecord));
         }
 
         return new(

CommunityToolkit.Mvvm.SourceGenerators/Models/TypeInfo.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
@@ -13,7 +14,8 @@ namespace CommunityToolkit.Mvvm.SourceGenerators.Models;
 /// </summary>
 /// <param name="QualifiedName">The qualified name for the type.</param>
 /// <param name="Kind">The type of the type in the hierarchy.</param>
-internal sealed record TypeInfo(string QualifiedName, TypeKind Kind)
+/// <param name="IsRecord">Whether the type is a record type.</param>
+internal sealed record TypeInfo(string QualifiedName, TypeKind Kind, bool IsRecord)
 {
     /// <summary>
     /// Creates a <see cref="TypeDeclarationSyntax"/> instance for the current info.
@@ -27,10 +29,17 @@ public TypeDeclarationSyntax GetSyntax()
         // <TYPE_KIND> <TYPE_NAME>
         // {
         // }
+        //
+        // Note that specifically for record declarations, we also need to explicitly add the open
+        // and close brace tokens, otherwise member declarations will not be formatted correctly.
         return Kind switch
         {
             TypeKind.Struct => StructDeclaration(QualifiedName),
             TypeKind.Interface => InterfaceDeclaration(QualifiedName),
+            TypeKind.Class when IsRecord =>
+                RecordDeclaration(Token(SyntaxKind.RecordKeyword), QualifiedName)
+                .WithOpenBraceToken(Token(SyntaxKind.OpenBraceToken))
+                .WithCloseBraceToken(Token(SyntaxKind.CloseBraceToken)),
             _ => ClassDeclaration(QualifiedName)
         };
     }

tests/CommunityToolkit.Mvvm.UnitTests/Test_SourceGenerators.cs

@@ -20,7 +20,7 @@ public partial class Test_SourceGenerators
     public void Test_SourceGenerators_NestedTypesThatAreNotJustClasses()
     {
         // This test just needs to compile, mostly
-        NestedStructType.NestedInterfaceType.MyViewModel model = new();
+        NestedStructType.NestedInterfaceType.NestedRecord.MyViewModel model = new();
 
         Assert.IsNull(model.Name);
         Assert.IsTrue(model.TestCommand is IRelayCommand);
@@ -30,16 +30,19 @@ public partial struct NestedStructType
     {
         public partial interface NestedInterfaceType
         {
-            [ObservableRecipient]
-            public partial class MyViewModel : ObservableValidator
+            public partial record NestedRecord
             {
-                [ObservableProperty]
-                [Required]
-                private string? name;
-
-                [ICommand]
-                private void Test()
+                [ObservableRecipient]
+                public partial class MyViewModel : ObservableValidator
                 {
+                    [ObservableProperty]
+                    [Required]
+                    private string? name;
+
+                    [ICommand]
+                    private void Test()
+                    {
+                    }
                 }
             }
         }
@@ -49,7 +52,7 @@ private void Test()
     public void Test_SourceGenerators_NestedTypesThatAreNotJustClassesAndWithGenerics()
     {
         // This test just needs to compile, mostly
-        NestedStructTypeWithGenerics<int, float>.NestedInterfaceType<string>.MyViewModel model = new();
+        NestedStructTypeWithGenerics<int, float>.NestedInterfaceType<string>.NestedRecord<string>.MyViewModel model = new();
 
         Assert.IsNull(model.Name);
         Assert.IsTrue(model.TestCommand is IRelayCommand);
@@ -60,15 +63,18 @@ public partial struct NestedStructTypeWithGenerics<T1, T2>
     {
         public partial interface NestedInterfaceType<TFoo>
         {
-            [INotifyPropertyChanged]
-            public partial class MyViewModel
+            public partial record NestedRecord<TBar>
             {
-                [ObservableProperty]
-                private string? name;
-
-                [ICommand]
-                private void Test()
+                [INotifyPropertyChanged]
+                public partial class MyViewModel
                 {
+                    [ObservableProperty]
+                    private string? name;
+
+                    [ICommand]
+                    private void Test()
+                    {
+                    }
                 }
             }
         }