Merge pull request #34 from Velociraptor45/fix/#33

#33: Fix colon in class declaration without base class

Author: Velociraptor45

RefleCS/RefleCS.Tests/Converters/CsFileConverterTestData.cs

@@ -11,6 +11,7 @@ public IEnumerator<object[]> GetEnumerator()
         yield return WithRecord();
         yield return WithClass();
         yield return WithClass_EmptyFieldInitializer();
+        yield return WithClass_NoBaseClass();
     }
 
     private object[] WithRecord()
@@ -149,6 +150,33 @@ private object[] WithClass_EmptyFieldInitializer()
         ];
     }
 
+    private object[] WithClass_NoBaseClass()
+    {
+        return
+        [
+            new CsFile(
+                new List<Using>
+                {
+                    new("System"),
+                    new("System.Linq")
+                },
+                new Namespace(
+                    "MyApp",
+                    new List<Class>
+                    {
+                        new(
+                            new List<ClassModifier> { ClassModifier.Private },
+                            "MyClass",
+                            new List<Constructor>(),
+                            new List<Field>(),
+                            new List<Property>(),
+                            new List<Method>(),
+                            new List<BaseType>())
+                    },
+                    []))
+        ];
+    }
+
     IEnumerator IEnumerable.GetEnumerator()
     {
         return GetEnumerator();

RefleCS/RefleCS/Converters/ClassConverter.cs

@@ -46,20 +46,24 @@ public IEnumerable<Class> ToClass(IEnumerable<ClassDeclarationSyntax> classDecla
 
     public ClassDeclarationSyntax ToNode(Class cls)
     {
-        var ctors = _constructorConverter.ToNode(cls.Constructors);
-        var fields = _fieldConverter.ToNode(cls.Fields);
-        var properties = _propertyConverter.ToNode(cls.Properties);
+        var ctors = _constructorConverter.ToNode(cls.Constructors).ToArray<MemberDeclarationSyntax>();
+        var fields = _fieldConverter.ToNode(cls.Fields).ToArray<MemberDeclarationSyntax>();
+        var properties = _propertyConverter.ToNode(cls.Properties).ToArray<MemberDeclarationSyntax>();
         var modifiers = _modifierConverter.ToNode(cls.Modifiers);
-        var methods = _methodConverter.ToNode(cls.Methods);
-        var baseTypes = _baseTypeConverter.ToNode(cls.BaseTypes);
+        var methods = _methodConverter.ToNode(cls.Methods).ToArray<MemberDeclarationSyntax>();
+        var baseTypes = _baseTypeConverter.ToNode(cls.BaseTypes).ToArray();
 
-        return SyntaxFactory.ClassDeclaration(cls.Name)
-            .AddBaseListTypes(baseTypes.ToArray())
+        var classDeclaration = SyntaxFactory.ClassDeclaration(cls.Name)
             .AddModifiers(modifiers.ToArray())
-            .AddMembers(fields.ToArray())
-            .AddMembers(ctors.ToArray())
-            .AddMembers(properties.ToArray())
-            .AddMembers(methods.ToArray());
+            .AddMembers(fields)
+            .AddMembers(ctors)
+            .AddMembers(properties)
+            .AddMembers(methods);
+
+        if (baseTypes.Any())
+            classDeclaration = classDeclaration.AddBaseListTypes(baseTypes);
+
+        return classDeclaration;
     }
 
     public IEnumerable<ClassDeclarationSyntax> ToNode(IEnumerable<Class> classes)

RefleCS/RefleCS/Converters/NamespaceConverter.cs

@@ -21,11 +21,11 @@ public Namespace ToNamespace(FileScopedNamespaceDeclarationSyntax nmsp)
 
     public FileScopedNamespaceDeclarationSyntax ToNode(Namespace nmsp)
     {
-        var classes = _classConverter.ToNode(nmsp.Classes);
-        var records = _recordConverter.ToNode(nmsp.Records);
+        var classes = _classConverter.ToNode(nmsp.Classes).ToArray<MemberDeclarationSyntax>();
+        var records = _recordConverter.ToNode(nmsp.Records).ToArray<MemberDeclarationSyntax>();
 
         return SyntaxFactory.FileScopedNamespaceDeclaration(SyntaxFactory.IdentifierName(nmsp.Name))
-            .AddMembers(classes.ToArray())
-            .AddMembers(records.ToArray());
+            .AddMembers(classes)
+            .AddMembers(records);
     }
 }

RefleCS/RefleCS/Converters/RecordConverter.cs

@@ -48,10 +48,10 @@ public IEnumerable<Record> ToRecord(IEnumerable<RecordDeclarationSyntax> classDe
 
     public RecordDeclarationSyntax ToNode(Record recrd)
     {
-        var ctors = _constructorConverter.ToNode(recrd.Constructors);
-        var properties = _propertyConverter.ToNode(recrd.Properties);
+        var ctors = _constructorConverter.ToNode(recrd.Constructors).ToArray<MemberDeclarationSyntax>();
+        var properties = _propertyConverter.ToNode(recrd.Properties).ToArray<MemberDeclarationSyntax>();
         var modifiers = _modifierConverter.ToNode(recrd.Modifiers);
-        var methods = _methodConverter.ToNode(recrd.Methods);
+        var methods = _methodConverter.ToNode(recrd.Methods).ToArray<MemberDeclarationSyntax>();
         var baseTypes = _baseTypeConverter.ToNode(recrd.BaseTypes).ToArray();
         var parameters = _parameterConverter.ToNode(recrd.Parameters);
 
@@ -64,9 +64,9 @@ public RecordDeclarationSyntax ToNode(Record recrd)
             .WithCloseBraceToken(closeBraceToken)
             .AddModifiers(modifiers.ToArray())
             .AddParameterListParameters(parameters.ToArray())
-            .AddMembers(ctors.ToArray())
-            .AddMembers(properties.ToArray())
-            .AddMembers(methods.ToArray());
+            .AddMembers(ctors)
+            .AddMembers(properties)
+            .AddMembers(methods);
 
         if (baseTypes.Any())
             node = node.AddBaseListTypes(baseTypes.ToArray());

RefleCS/RefleCS/RefleCS.csproj

@@ -9,7 +9,7 @@
     <PackageProjectUrl></PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <Version>0.3.0-alpha.1</Version>
+    <Version>0.3.0-alpha.2</Version>
     <RepositoryUrl>https://github.com/Velociraptor45/RefleCS</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>