Improve recovering state from an attribute end position.

xamarin · May 23, 2020 · 8db330a · 8db330a
1 parent 3784c36
commit 8db330a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Core/Dom/XmlDomExtensions.cs b/Core/Dom/XmlDomExtensions.cs
@@ -33,7 +33,8 @@ static XAttribute FindAttribute (this IAttributedXObject attContainer, int offse
 				if (att.Span.Start > offset) {
 					break;
 				}
-				if (att.Span.Contains (offset)) {
+				// If the position touches the end of the attribute, we still want to include the attribute
+				if (att.Span.ContainsOuter (offset)) {
 					return att;
 				}
 			}

diff --git a/Core/Parser/XmlTagState.cs b/Core/Parser/XmlTagState.cs
@@ -196,7 +196,7 @@ public override XmlParserContext TryRecreateState (XObject xobject, int position
 						newEl.Attributes.AddAttribute ((XAttribute)att.ShallowCopy ());
 						continue;
 					}
-					if (att.Span.End > position) {
+					if (att.Span.End >= position) {
 						position = att.Span.Start;
 						break;
 					}