Ensure missing-key errors include source spans

xoofx · xoofx · commit ed08af40e273 · 2026-03-03T02:29:42.000+01:00
diff --git a/src/Tomlyn.Tests/NewApiExceptionLocationTests.cs b/src/Tomlyn.Tests/NewApiExceptionLocationTests.cs
@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using Tomlyn.Parsing;
 using Tomlyn.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Tomlyn.Tests;
 
@@ -62,4 +63,41 @@ public void Parse_InvalidUtf8_IncludesByteOffset()
         Assert.That(ex.Column, Is.EqualTo(5));
         Assert.That(ex.Message, Does.Contain("utf8.toml("));
     }
+
+    [Test]
+    public void Deserialize_RootValueKeyNotFound_IncludesLocation()
+    {
+        var options = new TomlSerializerOptions
+        {
+            RootValueHandling = TomlRootValueHandling.WrapInRootKey,
+            RootValueKeyName = "value",
+            SourceName = "root.toml",
+        };
+
+        var ex = Assert.Throws<TomlException>(() => TomlSerializer.Deserialize<long>("other = 1\n", options));
+        Assert.That(ex, Is.Not.Null);
+        Assert.That(ex!.Span.HasValue, Is.True);
+        Assert.That(ex.Line, Is.GreaterThan(0));
+        Assert.That(ex.Column, Is.GreaterThan(0));
+        Assert.That(ex.Message, Does.Contain("root.toml("));
+    }
+
+    public sealed class MissingRequiredModel
+    {
+        [JsonRequired]
+        public string Name { get; set; } = string.Empty;
+    }
+
+    [Test]
+    public void Deserialize_ReflectionMissingRequiredKey_IncludesLocation()
+    {
+        var options = new TomlSerializerOptions { SourceName = "required.toml" };
+
+        var ex = Assert.Throws<TomlException>(() => TomlSerializer.Deserialize<MissingRequiredModel>("other = 1\n", options));
+        Assert.That(ex, Is.Not.Null);
+        Assert.That(ex!.Span.HasValue, Is.True);
+        Assert.That(ex.Line, Is.GreaterThan(0));
+        Assert.That(ex.Column, Is.GreaterThan(0));
+        Assert.That(ex.Message, Does.Contain("required.toml("));
+    }
 }
diff --git a/src/Tomlyn/Parsing/TomlParser.cs b/src/Tomlyn/Parsing/TomlParser.cs
@@ -646,7 +646,7 @@ private bool ProduceStatement()
                     CloseImplicitFrames(baseIndex: 0);
                     CloseExplicitFrames(targetPrefixLength: 0);
 
-                    EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));
+                    EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));
                     EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndDocument, span: null, propertyName: null, stringValue: null, data: 0));
                     _state = DocumentState.Ended;
                     return true;
@@ -717,7 +717,7 @@ private bool ProduceArray(ref ContainerFrame frame)
                     {
                         Consume(TokenKind.CloseBracket, DetermineLexerStateAfterContainerClose());
                         _containers.RemoveAt(_containers.Count - 1);
-                        EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: null, propertyName: null, stringValue: null, data: 0));
+                        EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));
                         return true;
                     }
 
@@ -743,7 +743,7 @@ private bool ProduceArray(ref ContainerFrame frame)
                     {
                         Consume(TokenKind.CloseBracket, DetermineLexerStateAfterContainerClose());
                         _containers.RemoveAt(_containers.Count - 1);
-                        EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: null, propertyName: null, stringValue: null, data: 0));
+                        EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));
                         return true;
                     }
 
@@ -756,7 +756,7 @@ private bool ProduceArray(ref ContainerFrame frame)
                 {
                     Consume(TokenKind.CloseBracket, DetermineLexerStateAfterContainerClose());
                     _containers.RemoveAt(_containers.Count - 1);
-                    EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: null, propertyName: null, stringValue: null, data: 0));
+                    EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));
                     return true;
                 }
 
@@ -790,13 +790,13 @@ private bool ProduceInlineTable(ref ContainerFrame frame)
                         if (_implicitFrames.Count > frame.InlineImplicitBase)
                         {
                             _implicitFrames.RemoveAt(_implicitFrames.Count - 1);
-                            EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));
+                            EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));
                             return true;
                         }
 
                         Consume(TokenKind.CloseBrace, DetermineLexerStateAfterContainerClose());
                         _containers.RemoveAt(_containers.Count - 1);
-                        EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));
+                        EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));
                         return true;
                     }
 
@@ -922,7 +922,7 @@ private void CloseImplicitFrames(int baseIndex)
             for (var i = _implicitFrames.Count - 1; i >= baseIndex; i--)
             {
                 _implicitFrames.RemoveAt(i);
-                EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));
+                EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));
             }
         }
 
@@ -935,10 +935,10 @@ private void CloseExplicitFrames(int targetPrefixLength)
                 {
                     case ExplicitFrameKind.Table:
                     case ExplicitFrameKind.TableArrayElement:
-                        EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));
+                        EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));
                         break;
                     case ExplicitFrameKind.Array:
-                        EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: null, propertyName: null, stringValue: null, data: 0));
+                        EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));
                         break;
                 }
 
@@ -1249,7 +1249,7 @@ private void EnsureImplicitPrefix(int baseIndex, List<KeySegment> pathSegments,
             for (var i = currentCount - 1; i >= common; i--)
             {
                 _implicitFrames.RemoveAt(baseIndex + i);
-                EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));
+                EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));
             }
 
             for (var i = common; i < prefixLength; i++)
@@ -1448,20 +1448,20 @@ private void TerminateStream()
                 if (frame.Kind == ContainerKind.InlineTable && _implicitFrames.Count > frame.InlineImplicitBase)
                 {
                     _implicitFrames.RemoveAt(_implicitFrames.Count - 1);
-                    EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));
+                    EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));
                     continue;
                 }
 
                 _containers.RemoveAt(_containers.Count - 1);
                 EnqueueEvent(frame.Kind == ContainerKind.Array
-                    ? new TomlParseEvent(TomlParseEventKind.EndArray, span: null, propertyName: null, stringValue: null, data: 0)
-                    : new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));
+                    ? new TomlParseEvent(TomlParseEventKind.EndArray, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0)
+                    : new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));
             }
 
             CloseImplicitFrames(baseIndex: 0);
             CloseExplicitFrames(targetPrefixLength: 0);
 
-            EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));
+            EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));
             EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndDocument, span: null, propertyName: null, stringValue: null, data: 0));
             _state = DocumentState.Ended;
         }
diff --git a/src/Tomlyn/Serialization/Internal/TomlReflectionTypeInfoResolver.cs b/src/Tomlyn/Serialization/Internal/TomlReflectionTypeInfoResolver.cs
@@ -10,6 +10,7 @@
 using Tomlyn.Serialization;
 using Tomlyn.Serialization.Converters;
 using Tomlyn.Syntax;
+using Tomlyn.Text;
 
 namespace Tomlyn.Serialization.Internal;
 
@@ -709,9 +710,11 @@ public override void Write(TomlWriter writer, object? value)
                 throw reader.CreateException($"Expected {TomlTokenType.StartTable} token but was {reader.TokenType}.");
             }
 
+            var tableStartSpan = reader.CurrentSpan;
+
             if (_parameters.Length > 0)
             {
-                return ReadWithConstructor(reader);
+                return ReadWithConstructor(reader, tableStartSpan);
             }
 
             var instance = CreateInstance();
@@ -780,11 +783,12 @@ public override void Write(TomlWriter writer, object? value)
                 reader.Skip();
             }
 
+            var endTableSpan = reader.CurrentSpan;
             reader.Read(); // consume EndTable
 
             if (seen is not null)
             {
-                ValidateRequiredMembers(seen);
+                ValidateRequiredMembers(seen, endTableSpan ?? tableStartSpan);
             }
 
             if (propertiesMetadata is not null)
@@ -874,7 +878,7 @@ private IDictionary CreateExtensionDataDictionary(Type memberType)
             return typeInfo.ReadAsObject(reader);
         }
 
-        private object ReadWithConstructor(TomlReader reader)
+        private object ReadWithConstructor(TomlReader reader, TomlSourceSpan? tableStartSpan)
         {
             TomlPropertiesMetadata? propertiesMetadata = null;
             if (Options.MetadataStore is not null && !Type.IsValueType)
@@ -971,6 +975,7 @@ private object ReadWithConstructor(TomlReader reader)
                 reader.Skip();
             }
 
+            var endTableSpan = reader.CurrentSpan;
             reader.Read(); // consume EndTable
 
             for (var i = 0; i < _parameters.Length; i++)
@@ -987,10 +992,20 @@ private object ReadWithConstructor(TomlReader reader)
                     continue;
                 }
 
+                if (endTableSpan is { } span)
+                {
+                    throw new TomlException(span, $"Missing required constructor parameter '{binding.KeyName}' when deserializing '{Type.FullName}'.");
+                }
+
+                if (tableStartSpan is { } startSpan)
+                {
+                    throw new TomlException(startSpan, $"Missing required constructor parameter '{binding.KeyName}' when deserializing '{Type.FullName}'.");
+                }
+
                 throw new TomlException($"Missing required constructor parameter '{binding.KeyName}' when deserializing '{Type.FullName}'.");
             }
 
-            ValidateRequiredMembers(memberSeen);
+            ValidateRequiredMembers(memberSeen, endTableSpan ?? tableStartSpan);
 
             object instance;
             try
@@ -1112,7 +1127,7 @@ private static TomlPropertyDisplayKind GetDisplayKind(TomlReader reader)
             }
         }
 
-        private void ValidateRequiredMembers(bool[] seen)
+        private void ValidateRequiredMembers(bool[] seen, TomlSourceSpan? span)
         {
             for (var i = 0; i < _members.Count; i++)
             {
@@ -1124,6 +1139,11 @@ private void ValidateRequiredMembers(bool[] seen)
 
                 if (!seen[i])
                 {
+                    if (span is { } locatedSpan)
+                    {
+                        throw new TomlException(locatedSpan, $"Missing required TOML key '{member.SerializedName}' when deserializing '{Type.FullName}'.");
+                    }
+
                     throw new TomlException($"Missing required TOML key '{member.SerializedName}' when deserializing '{Type.FullName}'.");
                 }
             }
diff --git a/src/Tomlyn/TomlSerializer.cs b/src/Tomlyn/TomlSerializer.cs
@@ -353,7 +353,7 @@ public static bool TryDeserialize(string toml, Type returnType, out object? valu
                 reader.Skip();
             }
 
-            throw new TomlException($"The root value key '{options.RootValueKeyName}' was not found.");
+            throw reader.CreateException($"The root value key '{options.RootValueKeyName}' was not found.");
         }
 
         return typeInfo.ReadAsObject(reader);

Original file line number	Diff line number	Diff line change
`@@ -646,7 +646,7 @@ private bool ProduceStatement()`
`646`	`646`	`CloseImplicitFrames(baseIndex: 0);`
`647`	`647`	`CloseExplicitFrames(targetPrefixLength: 0);`
`648`	`648`
`649`		`- EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));`
	`649`	`+ EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));`
`650`	`650`	`EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndDocument, span: null, propertyName: null, stringValue: null, data: 0));`
`651`	`651`	`_state = DocumentState.Ended;`
`652`	`652`	`return true;`
`@@ -717,7 +717,7 @@ private bool ProduceArray(ref ContainerFrame frame)`
`717`	`717`	`{`
`718`	`718`	`Consume(TokenKind.CloseBracket, DetermineLexerStateAfterContainerClose());`
`719`	`719`	`_containers.RemoveAt(_containers.Count - 1);`
`720`		`- EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: null, propertyName: null, stringValue: null, data: 0));`
	`720`	`+ EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));`
`721`	`721`	`return true;`
`722`	`722`	`}`
`723`	`723`
`@@ -743,7 +743,7 @@ private bool ProduceArray(ref ContainerFrame frame)`
`743`	`743`	`{`
`744`	`744`	`Consume(TokenKind.CloseBracket, DetermineLexerStateAfterContainerClose());`
`745`	`745`	`_containers.RemoveAt(_containers.Count - 1);`
`746`		`- EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: null, propertyName: null, stringValue: null, data: 0));`
	`746`	`+ EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));`
`747`	`747`	`return true;`
`748`	`748`	`}`
`749`	`749`
`@@ -756,7 +756,7 @@ private bool ProduceArray(ref ContainerFrame frame)`
`756`	`756`	`{`
`757`	`757`	`Consume(TokenKind.CloseBracket, DetermineLexerStateAfterContainerClose());`
`758`	`758`	`_containers.RemoveAt(_containers.Count - 1);`
`759`		`- EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: null, propertyName: null, stringValue: null, data: 0));`
	`759`	`+ EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));`
`760`	`760`	`return true;`
`761`	`761`	`}`
`762`	`762`
`@@ -790,13 +790,13 @@ private bool ProduceInlineTable(ref ContainerFrame frame)`
`790`	`790`	`if (_implicitFrames.Count > frame.InlineImplicitBase)`
`791`	`791`	`{`
`792`	`792`	`_implicitFrames.RemoveAt(_implicitFrames.Count - 1);`
`793`		`- EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));`
	`793`	`+ EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));`
`794`	`794`	`return true;`
`795`	`795`	`}`
`796`	`796`
`797`	`797`	`Consume(TokenKind.CloseBrace, DetermineLexerStateAfterContainerClose());`
`798`	`798`	`_containers.RemoveAt(_containers.Count - 1);`
`799`		`- EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));`
	`799`	`+ EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));`
`800`	`800`	`return true;`
`801`	`801`	`}`
`802`	`802`
`@@ -922,7 +922,7 @@ private void CloseImplicitFrames(int baseIndex)`
`922`	`922`	`for (var i = _implicitFrames.Count - 1; i >= baseIndex; i--)`
`923`	`923`	`{`
`924`	`924`	`_implicitFrames.RemoveAt(i);`
`925`		`- EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));`
	`925`	`+ EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));`
`926`	`926`	`}`
`927`	`927`	`}`
`928`	`928`
`@@ -935,10 +935,10 @@ private void CloseExplicitFrames(int targetPrefixLength)`
`935`	`935`	`{`
`936`	`936`	`case ExplicitFrameKind.Table:`
`937`	`937`	`case ExplicitFrameKind.TableArrayElement:`
`938`		`- EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));`
	`938`	`+ EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));`
`939`	`939`	`break;`
`940`	`940`	`case ExplicitFrameKind.Array:`
`941`		`- EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: null, propertyName: null, stringValue: null, data: 0));`
	`941`	`+ EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndArray, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));`
`942`	`942`	`break;`
`943`	`943`	`}`
`944`	`944`
`@@ -1249,7 +1249,7 @@ private void EnsureImplicitPrefix(int baseIndex, List<KeySegment> pathSegments,`
`1249`	`1249`	`for (var i = currentCount - 1; i >= common; i--)`
`1250`	`1250`	`{`
`1251`	`1251`	`_implicitFrames.RemoveAt(baseIndex + i);`
`1252`		`- EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));`
	`1252`	`+ EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));`
`1253`	`1253`	`}`
`1254`	`1254`
`1255`	`1255`	`for (var i = common; i < prefixLength; i++)`
`@@ -1448,20 +1448,20 @@ private void TerminateStream()`
`1448`	`1448`	`if (frame.Kind == ContainerKind.InlineTable && _implicitFrames.Count > frame.InlineImplicitBase)`
`1449`	`1449`	`{`
`1450`	`1450`	`_implicitFrames.RemoveAt(_implicitFrames.Count - 1);`
`1451`		`- EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));`
	`1451`	`+ EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));`
`1452`	`1452`	`continue;`
`1453`	`1453`	`}`
`1454`	`1454`
`1455`	`1455`	`_containers.RemoveAt(_containers.Count - 1);`
`1456`	`1456`	`EnqueueEvent(frame.Kind == ContainerKind.Array`
`1457`		`- ? new TomlParseEvent(TomlParseEventKind.EndArray, span: null, propertyName: null, stringValue: null, data: 0)`
`1458`		`- : new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));`
	`1457`	`+ ? new TomlParseEvent(TomlParseEventKind.EndArray, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0)`
	`1458`	`+ : new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));`
`1459`	`1459`	`}`
`1460`	`1460`
`1461`	`1461`	`CloseImplicitFrames(baseIndex: 0);`
`1462`	`1462`	`CloseExplicitFrames(targetPrefixLength: 0);`
`1463`	`1463`
`1464`		`- EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: null, propertyName: null, stringValue: null, data: 0));`
	`1464`	`+ EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndTable, span: CurrentSpan(), propertyName: null, stringValue: null, data: 0));`
`1465`	`1465`	`EnqueueEvent(new TomlParseEvent(TomlParseEventKind.EndDocument, span: null, propertyName: null, stringValue: null, data: 0));`
`1466`	`1466`	`_state = DocumentState.Ended;`
`1467`	`1467`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`using Tomlyn.Serialization;`
`11`	`11`	`using Tomlyn.Serialization.Converters;`
`12`	`12`	`using Tomlyn.Syntax;`
	`13`	`+using Tomlyn.Text;`
`13`	`14`
`14`	`15`	`namespace Tomlyn.Serialization.Internal;`
`15`	`16`
`@@ -709,9 +710,11 @@ public override void Write(TomlWriter writer, object? value)`
`709`	`710`	`throw reader.CreateException($"Expected {TomlTokenType.StartTable} token but was {reader.TokenType}.");`
`710`	`711`	`}`
`711`	`712`
	`713`	`+ var tableStartSpan = reader.CurrentSpan;`
	`714`	`+`
`712`	`715`	`if (_parameters.Length > 0)`
`713`	`716`	`{`
`714`		`- return ReadWithConstructor(reader);`
	`717`	`+ return ReadWithConstructor(reader, tableStartSpan);`
`715`	`718`	`}`
`716`	`719`
`717`	`720`	`var instance = CreateInstance();`
`@@ -780,11 +783,12 @@ public override void Write(TomlWriter writer, object? value)`
`780`	`783`	`reader.Skip();`
`781`	`784`	`}`
`782`	`785`
	`786`	`+ var endTableSpan = reader.CurrentSpan;`
`783`	`787`	`reader.Read(); // consume EndTable`
`784`	`788`
`785`	`789`	`if (seen is not null)`
`786`	`790`	`{`
`787`		`- ValidateRequiredMembers(seen);`
	`791`	`+ ValidateRequiredMembers(seen, endTableSpan ?? tableStartSpan);`
`788`	`792`	`}`
`789`	`793`
`790`	`794`	`if (propertiesMetadata is not null)`
`@@ -874,7 +878,7 @@ private IDictionary CreateExtensionDataDictionary(Type memberType)`
`874`	`878`	`return typeInfo.ReadAsObject(reader);`
`875`	`879`	`}`
`876`	`880`
`877`		`- private object ReadWithConstructor(TomlReader reader)`
	`881`	`+ private object ReadWithConstructor(TomlReader reader, TomlSourceSpan? tableStartSpan)`
`878`	`882`	`{`
`879`	`883`	`TomlPropertiesMetadata? propertiesMetadata = null;`
`880`	`884`	`if (Options.MetadataStore is not null && !Type.IsValueType)`
`@@ -971,6 +975,7 @@ private object ReadWithConstructor(TomlReader reader)`
`971`	`975`	`reader.Skip();`
`972`	`976`	`}`
`973`	`977`
	`978`	`+ var endTableSpan = reader.CurrentSpan;`
`974`	`979`	`reader.Read(); // consume EndTable`
`975`	`980`
`976`	`981`	`for (var i = 0; i < _parameters.Length; i++)`
`@@ -987,10 +992,20 @@ private object ReadWithConstructor(TomlReader reader)`
`987`	`992`	`continue;`
`988`	`993`	`}`
`989`	`994`
	`995`	`+ if (endTableSpan is { } span)`
	`996`	`+ {`
	`997`	`+ throw new TomlException(span, $"Missing required constructor parameter '{binding.KeyName}' when deserializing '{Type.FullName}'.");`
	`998`	`+ }`
	`999`	`+`
	`1000`	`+ if (tableStartSpan is { } startSpan)`
	`1001`	`+ {`
	`1002`	`+ throw new TomlException(startSpan, $"Missing required constructor parameter '{binding.KeyName}' when deserializing '{Type.FullName}'.");`
	`1003`	`+ }`
	`1004`	`+`
`990`	`1005`	`throw new TomlException($"Missing required constructor parameter '{binding.KeyName}' when deserializing '{Type.FullName}'.");`
`991`	`1006`	`}`
`992`	`1007`
`993`		`- ValidateRequiredMembers(memberSeen);`
	`1008`	`+ ValidateRequiredMembers(memberSeen, endTableSpan ?? tableStartSpan);`
`994`	`1009`
`995`	`1010`	`object instance;`
`996`	`1011`	`try`
`@@ -1112,7 +1127,7 @@ private static TomlPropertyDisplayKind GetDisplayKind(TomlReader reader)`
`1112`	`1127`	`}`
`1113`	`1128`	`}`
`1114`	`1129`
`1115`		`- private void ValidateRequiredMembers(bool[] seen)`
	`1130`	`+ private void ValidateRequiredMembers(bool[] seen, TomlSourceSpan? span)`
`1116`	`1131`	`{`
`1117`	`1132`	`for (var i = 0; i < _members.Count; i++)`
`1118`	`1133`	`{`
`@@ -1124,6 +1139,11 @@ private void ValidateRequiredMembers(bool[] seen)`
`1124`	`1139`
`1125`	`1140`	`if (!seen[i])`
`1126`	`1141`	`{`
	`1142`	`+ if (span is { } locatedSpan)`
	`1143`	`+ {`
	`1144`	`+ throw new TomlException(locatedSpan, $"Missing required TOML key '{member.SerializedName}' when deserializing '{Type.FullName}'.");`
	`1145`	`+ }`
	`1146`	`+`
`1127`	`1147`	`throw new TomlException($"Missing required TOML key '{member.SerializedName}' when deserializing '{Type.FullName}'.");`
`1128`	`1148`	`}`
`1129`	`1149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ public static bool TryDeserialize(string toml, Type returnType, out object? valu`
`353`	`353`	`reader.Skip();`
`354`	`354`	`}`
`355`	`355`
`356`		`- throw new TomlException($"The root value key '{options.RootValueKeyName}' was not found.");`
	`356`	`+ throw reader.CreateException($"The root value key '{options.RootValueKeyName}' was not found.");`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`return typeInfo.ReadAsObject(reader);`