Merge pull request #123 from leancodepl/feature/struct-dto

Allow parsing `struct`s
leancodepl · Dec 12, 2022 · aafbe24 · aafbe24
2 parents bbec17c + 13ba344
commit aafbe24
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `dotnet contracts-generate` global tool,
 - Allow running the generator in check-only mode,
 - _Invalid type_ analyzer,
-- Enum members (`EnumValue`) have attributes.
+- Enum members (`EnumValue`) have attributes,
+- Support for `struct` members.
 
 ### Breaking changes
 

diff --git a/examples/properties/inner_struct.cs b/examples/properties/inner_struct.cs
@@ -0,0 +1,7 @@
+public class DTO
+{
+    InnerDTO A { get; set; }
+    InnerDTO? B { get; set; }
+}
+
+public struct InnerDTO { }
diff --git a/examples/properties/struct.cs b/examples/properties/struct.cs
@@ -0,0 +1,4 @@
+public struct DTO
+{
+    int A { get; set; }
+}
diff --git a/examples/simple/struct.cs b/examples/simple/struct.cs
@@ -0,0 +1 @@
+public struct DTO {}
diff --git a/src/LeanCode.ContractsGenerator.Tests/ExampleBased/Properties.cs b/src/LeanCode.ContractsGenerator.Tests/ExampleBased/Properties.cs
@@ -52,4 +52,23 @@ public void Properties_with_binary_types()
                 .WithProperty("C", Array(Known(KnownType.Binary)))
                 .WithProperty("D", Map(Known(KnownType.Binary), Known(KnownType.Binary)));
     }
+
+    [Fact]
+    public void Properties_inside_struct_types()
+    {
+        "properties/struct.cs"
+            .Compiles()
+            .WithDto("DTO")
+                .WithProperty("A", Known(KnownType.Int32));
+    }
+
+    [Fact]
+    public void Properties_with_struct_types()
+    {
+        "properties/inner_struct.cs"
+            .Compiles()
+            .WithDto("DTO")
+                .WithProperty("A", TypeRefExtensions.Internal("InnerDTO"))
+                .WithProperty("B", TypeRefExtensions.Internal("InnerDTO").Nullable());
+    }
 }
diff --git a/src/LeanCode.ContractsGenerator.Tests/ExampleBased/Simple.cs b/src/LeanCode.ContractsGenerator.Tests/ExampleBased/Simple.cs
@@ -50,6 +50,15 @@ public void Simple_Dto()
             .Dto("DTO");
     }
 
+    [Fact]
+    public void Simple_Struct()
+    {
+        "simple/struct.cs"
+            .Compiles()
+            .WithSingle()
+            .Dto("DTO");
+    }
+
     [Fact]
     public void Simple_Enum()
     {

diff --git a/src/LeanCode.ContractsGenerator/Generation/ContractsGenerator.cs b/src/LeanCode.ContractsGenerator/Generation/ContractsGenerator.cs
@@ -173,6 +173,7 @@ private bool IsIgnored([System.Diagnostics.CodeAnalysis.NotNullWhen(false)] INam
     {
         return symbol is null ||
             symbol.SpecialType == SpecialType.System_Object ||
+            symbol.SpecialType == SpecialType.System_ValueType ||
             symbol.SpecialType == SpecialType.System_Enum ||
             ErrorCodes.IsErrorCode(symbol) ||
             contracts.Types.IsAttributeUsageType(symbol);