Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove most of string.Trim() usages in System.Private.Xml solution. #75452

Merged
merged 5 commits into from
Sep 26, 2022
Merged

Remove most of string.Trim() usages in System.Private.Xml solution. #75452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f357baf
Remove most of string.Trim() usages in Xml solution.
TrayanZapryanov Sep 12, 2022
0c9cc54
Address feedback
TrayanZapryanov Sep 12, 2022
68eb6b2
Merge branch 'dotnet:main' into xmlconvert_reduce_trimstring_usage
TrayanZapryanov Sep 16, 2022
fac67e1
Merge branch 'dotnet:main' into xmlconvert_reduce_trimstring_usage
TrayanZapryanov Sep 20, 2022
4644c4f
Add checks if input string is null
TrayanZapryanov Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5119,7 +5119,7 @@ private void OnXmlReservedAttribute(NodeData attr)
PushXmlContext();
}

switch (XmlConvert.TrimString(attr.StringValue))
switch (attr.StringValue.AsSpan().Trim(XmlConvert.WhitespaceChars))
{
case "preserve":
_xmlContext.xmlSpace = XmlSpace.Preserve;
Expand Down
20 changes: 9 additions & 11 deletions src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1758,18 +1758,16 @@ private void HandleSpecialAttribute()
break;
case SpecialAttr.XmlSpace:
// validate XmlSpace attribute
value = XmlConvert.TrimString(value);
if (value == "default")
switch (value.AsSpan().Trim(XmlConvert.WhitespaceChars))
{
_stack[_top].xmlSpace = XmlSpace.Default;
}
else if (value == "preserve")
{
_stack[_top].xmlSpace = XmlSpace.Preserve;
}
else
{
throw new ArgumentException(SR.Format(SR.Xml_InvalidXmlSpace, value));
case "default":
_stack[_top].xmlSpace = XmlSpace.Default;
break;
case "preserve":
_stack[_top].xmlSpace = XmlSpace.Preserve;
break;
default:
throw new ArgumentException(SR.Format(SR.Xml_InvalidXmlSpace, value));
}
break;
case SpecialAttr.XmlNs:
Expand Down
5 changes: 3 additions & 2 deletions src/libraries/System.Private.Xml/src/System/Xml/Core/XmlWellFormedWriterHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,10 +403,11 @@ internal void Trim()

// trim the string in StringBuilder
string valBefore = _stringValue.ToString();
string valAfter = XmlConvert.TrimString(valBefore);
ReadOnlySpan<char> valAfter = valBefore.AsSpan().Trim(XmlConvert.WhitespaceChars);
if (valBefore != valAfter)
TrayanZapryanov marked this conversation as resolved.
Show resolved Hide resolved
{
_stringValue = new StringBuilder(valAfter);
_stringValue = new StringBuilder();
TrayanZapryanov marked this conversation as resolved.
Show resolved Hide resolved
_stringValue.Append(valAfter);
}

// trim the beginning of the recorded writer events
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Private.Xml/src/System/Xml/Dom/XmlNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1349,7 +1349,7 @@ internal virtual XmlSpace XmlSpace
elem = node as XmlElement;
if (elem != null && elem.HasAttribute("xml:space"))
{
switch (XmlConvert.TrimString(elem.GetAttribute("xml:space")))
switch (elem.GetAttribute("xml:space").AsSpan().Trim(XmlConvert.WhitespaceChars))
{
case "default":
return XmlSpace.Default;
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlValueConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ protected static byte[] StringToHexBinary(string value)
{
try
{
return XmlConvert.FromBinHexString(XmlConvert.TrimString(value), false);
krwq marked this conversation as resolved.
Show resolved Hide resolved
return XmlConvert.FromBinHexString(value.AsSpan().Trim(XmlConvert.WhitespaceChars), false);
}
catch (XmlException e)
{
Expand Down
3 changes: 1 addition & 2 deletions src/libraries/System.Private.Xml/src/System/Xml/Serialization/Xmlcustomformatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,7 @@ internal static char ToChar(string value)
internal static byte[]? ToByteArrayHex(string? value)
{
if (value == null) return null;
value = value.Trim();
return XmlConvert.FromBinHexString(value);
return XmlConvert.FromBinHexString(value.AsSpan().Trim(), true);
}

internal static long ToEnum(string val, Hashtable vals, string? typeName, bool validate)
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Private.Xml/src/System/Xml/XPath/XPathNavigatorReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ public override XmlSpace XmlSpace
{
if (tempNav.MoveToAttribute(XPathNavigatorReader.space, XmlReservedNs.NsXml))
{
switch (XmlConvert.TrimString(tempNav.Value))
switch (tempNav.Value.AsSpan().Trim(XmlConvert.WhitespaceChars))
{
case "default":
return XmlSpace.Default;
Expand Down