fix: IgnoreMissingProperties should ignore objects

Signed-off-by: Matthew Fisher <matt.fisher@fermyon.com>
xoofx · Oct 12, 2022 · cca52d5 · cca52d5
1 parent 5605d7c
commit cca52d5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/Tomlyn.Tests/ModelTests/ReflectionModelTests.cs b/src/Tomlyn.Tests/ModelTests/ReflectionModelTests.cs
@@ -428,7 +428,9 @@ public void TestModelWithFixedList()
         public void TestModelWithMissingProperties()
         {
             var input = @"values = ['1', '2', '3']
-some_thing_that_doesnt_exist = true";
+some_thing_that_doesnt_exist = true
+[object_that_doesnt_exist]
+required = true";
 
             StandardTests.DisplayHeader("input");
             Console.WriteLine(input);

diff --git a/src/Tomlyn/Model/Accessors/DictionaryDynamicAccessor.cs b/src/Tomlyn/Model/Accessors/DictionaryDynamicAccessor.cs
@@ -107,7 +107,12 @@ public override bool TryCreateAndSetDefaultPropertyValue(SourceSpan span, object
             errorMessage = $"Unexpected error when creating object for property {name} on object type {TargetType.FullName}. Reason: {ex.Message}";
         }
 
-        Context.Diagnostics.Error(span, errorMessage);
+        // If configured to ignore missing properties on the target type,
+        // return false to indicate it is missing but don't set an error
+        if (!Context.IgnoreMissingProperties)
+        {
+            Context.Diagnostics.Error(span, errorMessage);
+        }
         return false;
     }
 

diff --git a/src/Tomlyn/Model/Accessors/StandardObjectDynamicAccessor.cs b/src/Tomlyn/Model/Accessors/StandardObjectDynamicAccessor.cs
@@ -197,7 +197,12 @@ public override bool TryCreateAndSetDefaultPropertyValue(SourceSpan span, object
             errorMessage = $"Unexpected error when creating object for property {name} on object type {TargetType.FullName}. Reason: {ex.Message}";
         }
 
-        Context.Diagnostics.Error(span, errorMessage);
+        // If configured to ignore missing properties on the target type,
+        // return false to indicate it is missing but don't set an error
+        if (!Context.IgnoreMissingProperties)
+        {
+            Context.Diagnostics.Error(span, errorMessage);
+        }
         return false;
     }
 }