Skip to content

Commit 08aff10

Browse files
kronickronic
authored
Convert concatenation string to interpolation for System.Private.Xml (#60057)
* use interpolation string * fix XmlSerializationReader * fix new line * fix new line for XmlSerializationReaderILGen * review feedback * review feedback * fix XmlTextWriter * fix Compiler * fix XmlSchemaExporter * fix XmlSchemas * fix XmlSerializationReader * fix XmlSerializationWriter * fix XmlSerializationWriter * fix XmlSerializationWriterILGen * fix QilValidationVisitor * fix XmlSerializationReaderILGen * fix XmlQueryOutput Co-authored-by: kronic <kronic@softland.ru>
1 parent 2924d19 commit 08aff10

File tree

91 files changed

+401
-409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+401
-409
lines changed

‎src/libraries/System.Private.Xml/src/System/Xml/BinaryXml/XmlBinaryReader.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public override string ToString()
120120
if (prefix.Length == 0)
121121
return this.localname;
122122
else
123-
return this.prefix + ":" + this.localname;
123+
return $"{this.prefix}:{this.localname}";
124124
}
125125

126126
public static bool operator ==(QName a, QName b)
@@ -4048,7 +4048,7 @@ private string ValueAsString(BinXmlToken token)
40484048
if (qname.prefix.Length == 0)
40494049
return qname.localname;
40504050
else
4051-
return string.Concat(qname.prefix, ":", qname.localname);
4051+
return $"{qname.prefix}:{qname.localname}";
40524052
}
40534053

40544054
default:
@@ -4422,7 +4422,7 @@ private object ValueAs(BinXmlToken token, Type returnType, IXmlNamespaceResolver
44224422

44234423
private Exception ThrowUnexpectedToken(BinXmlToken token)
44244424
{
4425-
System.Diagnostics.Debug.WriteLine("Unhandled token: " + token.ToString());
4425+
System.Diagnostics.Debug.WriteLine($"Unhandled token: {token}");
44264426
return ThrowXmlException(SR.XmlBinary_UnexpectedToken);
44274427
}
44284428

‎src/libraries/System.Private.Xml/src/System/Xml/Cache/XPathNode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public string Name
9797
}
9898
else
9999
{
100-
return string.Concat(Prefix, ":", LocalName);
100+
return $"{Prefix}:{LocalName}";
101101
}
102102
}
103103
}

‎src/libraries/System.Private.Xml/src/System/Xml/Core/QueryOutputWriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public override void WriteStartElement(string? prefix, string localName, string?
163163
if (_outputDocType)
164164
{
165165
_wrapped.WriteDocType(
166-
string.IsNullOrEmpty(prefix) ? localName : prefix + ":" + localName,
166+
string.IsNullOrEmpty(prefix) ? localName : $"{prefix}:{localName}",
167167
_publicId,
168168
_systemId,
169169
null);

‎src/libraries/System.Private.Xml/src/System/Xml/Core/QueryOutputWriterV1.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public override void WriteStartElement(string? prefix, string localName, string?
145145
if (ws == WriteState.Start || ws == WriteState.Prolog)
146146
{
147147
_wrapped.WriteDocType(
148-
string.IsNullOrEmpty(prefix) ? localName : prefix + ":" + localName,
148+
string.IsNullOrEmpty(prefix) ? localName : $"{prefix}:{localName}",
149149
_publicId,
150150
_systemId,
151151
null);

‎src/libraries/System.Private.Xml/src/System/Xml/Core/ValidatingReaderNodeData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public string GetAtomizedNameWPrefix(XmlNameTable nameTable)
8484
}
8585
else
8686
{
87-
_nameWPrefix = nameTable.Add(string.Concat(_prefix, ":", _localName));
87+
_nameWPrefix = nameTable.Add($"{_prefix}:{_localName}");
8888
}
8989
}
9090

‎src/libraries/System.Private.Xml/src/System/Xml/Core/XmlEventCache.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ public void EventsToWriter(XmlWriter writer)
242242
break;
243243

244244
default:
245-
Debug.Fail("Unknown event: " + page[idxEvent].EventType);
245+
Debug.Fail($"Unknown event: {page[idxEvent].EventType}");
246246
break;
247247
}
248248
}

‎src/libraries/System.Private.Xml/src/System/Xml/Core/XmlSubtreeReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ private void AddNamespace(string prefix, string ns)
13261326
{
13271327
localName = prefix;
13281328
attrPrefix = _xmlns;
1329-
name = reader.NameTable.Add(string.Concat(_xmlns, ":", prefix));
1329+
name = reader.NameTable.Add($"{_xmlns}:{prefix}");
13301330
}
13311331

13321332
if (_nsAttributes[index] == null)

‎src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ internal XmlTextReaderImpl(string xmlFragment, XmlNodeType fragType, XmlParserCo
555555
internal XmlTextReaderImpl(string xmlFragment, XmlParserContext? context)
556556
: this(null == context || null == context.NameTable ? new NameTable() : context.NameTable)
557557
{
558-
InitStringInput((context == null) ? string.Empty : context.BaseURI, Encoding.Unicode, string.Concat("<?xml ", xmlFragment, "?>"));
558+
InitStringInput((context == null) ? string.Empty : context.BaseURI, Encoding.Unicode, $"<?xml {xmlFragment}?>");
559559
InitFragmentReader(XmlNodeType.XmlDeclaration, context, true);
560560
}
561561

‎src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImplHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ internal string CreateNameWPrefix(XmlNameTable nt)
681681
}
682682
else
683683
{
684-
nameWPrefix = nt.Add(string.Concat(prefix, ":", localName));
684+
nameWPrefix = nt.Add($"{prefix}:{localName}");
685685
}
686686
return nameWPrefix;
687687
}

‎src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextWriter.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -450,15 +450,15 @@ public override void WriteDocType(string name, string? pubid, string? sysid, str
450450
_textWriter.Write(name);
451451
if (pubid != null)
452452
{
453-
_textWriter.Write(" PUBLIC " + _quoteChar);
453+
_textWriter.Write($" PUBLIC {_quoteChar}");
454454
_textWriter.Write(pubid);
455-
_textWriter.Write(_quoteChar + " " + _quoteChar);
455+
_textWriter.Write($"{_quoteChar} {_quoteChar}");
456456
_textWriter.Write(sysid);
457457
_textWriter.Write(_quoteChar);
458458
}
459459
else if (sysid != null)
460460
{
461-
_textWriter.Write(" SYSTEM " + _quoteChar);
461+
_textWriter.Write($" SYSTEM {_quoteChar}");
462462
_textWriter.Write(sysid);
463463
_textWriter.Write(_quoteChar);
464464
}
@@ -1592,8 +1592,7 @@ private void PopNamespaces(int indexFrom, int indexTo)
15921592
private string GeneratePrefix()
15931593
{
15941594
int temp = _stack[_top].prefixCount++ + 1;
1595-
return "d" + _top.ToString("d", CultureInfo.InvariantCulture)
1596-
+ "p" + temp.ToString("d", CultureInfo.InvariantCulture);
1595+
return string.Create(CultureInfo.InvariantCulture, $"d{_top:d}p{temp:d}");
15971596
}
15981597

15991598
private void InternalWriteProcessingInstruction(string name, string? text)

‎src/libraries/System.Private.Xml/src/System/Xml/Core/XmlWellFormedWriter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,7 @@ private static string GetStateName(State state)
20742074
{
20752075
if (state >= State.Error)
20762076
{
2077-
Debug.Fail("We should never get to this point. State = " + state);
2077+
Debug.Fail($"We should never get to this point. State = {state}");
20782078
return "Error";
20792079
}
20802080
else
@@ -2176,7 +2176,7 @@ private void ThrowInvalidStateTransition(Token token, State currentState)
21762176
case State.Start:
21772177
if (_conformanceLevel == ConformanceLevel.Document)
21782178
{
2179-
throw new InvalidOperationException(wrongTokenMessage + ' ' + SR.Xml_ConformanceLevelFragment);
2179+
throw new InvalidOperationException($"{wrongTokenMessage} {SR.Xml_ConformanceLevelFragment}");
21802180
}
21812181
break;
21822182
}

‎src/libraries/System.Private.Xml/src/System/Xml/Core/XsdValidatingReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public override string Name
244244
string? prefix = _validator.GetDefaultAttributePrefix(_cachedNode.Namespace);
245245
if (prefix != null && prefix.Length != 0)
246246
{
247-
return prefix + ":" + _cachedNode.LocalName;
247+
return $"{prefix}:{_cachedNode.LocalName}";
248248
}
249249

250250
return _cachedNode.LocalName;

‎src/libraries/System.Private.Xml/src/System/Xml/Dom/DocumentXmlWriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ private void CloseWithAppendAttribute()
441441
if (offset != -1
442442
&& ((XmlAttribute)attrs.nodes[offset]).Specified)
443443
{
444-
throw new XmlException(SR.Xml_DupAttributeName, attr.Prefix.Length == 0 ? attr.LocalName : string.Concat(attr.Prefix, ":", attr.LocalName));
444+
throw new XmlException(SR.Xml_DupAttributeName, attr.Prefix.Length == 0 ? attr.LocalName : $"{attr.Prefix}:{attr.LocalName}");
445445
}
446446
}
447447
for (int i = 0; i < _fragment.Count; i++)

‎src/libraries/System.Private.Xml/src/System/Xml/Dom/XmlEntityReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ private string ConstructBaseURI(string baseURI, string systemId)
188188
if (nCount > 0 && nCount < baseURI.Length)
189189
buf = baseURI.Substring(0, nCount);
190190
else if (nCount == 0)
191-
buf = buf + "\\";
191+
buf = $"{buf}\\";
192192
return (buf + systemId.Replace('\\', '/'));
193193
}
194194

‎src/libraries/System.Private.Xml/src/System/Xml/Dom/XmlLoader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ private void RemoveDuplicateNamespace(XmlElement elem, XmlNamespaceManager mgr,
865865

866866
private string EntitizeName(string name)
867867
{
868-
return "&" + name + ";";
868+
return $"&{name};";
869869
}
870870

871871
//The function is called when expanding the entity when its children being asked

‎src/libraries/System.Private.Xml/src/System/Xml/Dom/XmlName.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public string Name
9191
{
9292
if (_localName.Length > 0)
9393
{
94-
string n = string.Concat(_prefix, ":", _localName);
94+
string n = $"{_prefix}:{_localName}";
9595
lock (ownerDoc.NameTable)
9696
{
9797
if (_name == null)

‎src/libraries/System.Private.Xml/src/System/Xml/Dom/XmlNode.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,23 +1471,23 @@ public override string ToString()
14711471
{
14721472
case XmlNodeType.Element:
14731473
case XmlNodeType.EntityReference:
1474-
result += ", Name=\"" + _node.Name + "\"";
1474+
result += $", Name=\"{_node.Name}\"";
14751475
break;
14761476
case XmlNodeType.Attribute:
14771477
case XmlNodeType.ProcessingInstruction:
1478-
result += ", Name=\"" + _node.Name + "\", Value=\"" + XmlConvert.EscapeValueForDebuggerDisplay(_node.Value!) + "\"";
1478+
result += $", Name=\"{_node.Name}\", Value=\"{XmlConvert.EscapeValueForDebuggerDisplay(_node.Value!)}\"";
14791479
break;
14801480
case XmlNodeType.Text:
14811481
case XmlNodeType.CDATA:
14821482
case XmlNodeType.Comment:
14831483
case XmlNodeType.Whitespace:
14841484
case XmlNodeType.SignificantWhitespace:
14851485
case XmlNodeType.XmlDeclaration:
1486-
result += ", Value=\"" + XmlConvert.EscapeValueForDebuggerDisplay(_node.Value!) + "\"";
1486+
result += $", Value=\"{XmlConvert.EscapeValueForDebuggerDisplay(_node.Value!)}\"";
14871487
break;
14881488
case XmlNodeType.DocumentType:
14891489
XmlDocumentType documentType = (XmlDocumentType)_node;
1490-
result += ", Name=\"" + documentType.Name + "\", SYSTEM=\"" + documentType.SystemId + "\", PUBLIC=\"" + documentType.PublicId + "\", Value=\"" + XmlConvert.EscapeValueForDebuggerDisplay(documentType.InternalSubset!) + "\"";
1490+
result += $", Name=\"{documentType.Name}\", SYSTEM=\"{documentType.SystemId}\", PUBLIC=\"{documentType.PublicId}\", Value=\"{XmlConvert.EscapeValueForDebuggerDisplay(documentType.InternalSubset!)}\"";
14911491
break;
14921492
default:
14931493
break;

‎src/libraries/System.Private.Xml/src/System/Xml/Dom/XmlNodeReader.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public string Value
247247
InitDecAttr();
248248
for (int i = 0; i < _nDeclarationAttrCount; i++)
249249
{
250-
strb.Append(decNodeAttributes[i].name + "=\"" + decNodeAttributes[i].value + "\"");
250+
strb.Append($"{decNodeAttributes[i].name}=\"{decNodeAttributes[i].value}\"");
251251
if (i != (_nDeclarationAttrCount - 1))
252252
strb.Append(' ');
253253
}
@@ -859,7 +859,7 @@ public bool MoveToElement()
859859
if (prefix.Length == 0)
860860
attrName = "xmlns";
861861
else
862-
attrName = "xmlns:" + prefix;
862+
attrName = $"xmlns:{prefix}";
863863

864864
// walk up the XmlNode parent chain, looking for the xmlns attribute
865865
XmlNode? node = _curNode;

‎src/libraries/System.Private.Xml/src/System/Xml/Schema/ContentValidator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public string NameOf(int symbol)
233233
{
234234
if ((int)de!.Value! == symbol)
235235
{
236-
return (string)de.Key + ":*";
236+
return $"{(string)de.Key}:*";
237237
}
238238
}
239239
}

‎src/libraries/System.Private.Xml/src/System/Xml/Schema/XdrBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ private static void XDR_BeginRoot(XdrBuilder builder)
653653
{ // inline xdr schema
654654
if (builder._XdrName != null)
655655
{
656-
builder._TargetNamespace = builder._NameTable.Add("x-schema:#" + builder._XdrName);
656+
builder._TargetNamespace = builder._NameTable.Add($"x-schema:#{builder._XdrName}");
657657
}
658658
else
659659
{

‎src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlSchemaAny.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ internal override string NameString
6969
int i = 1;
7070
foreach (string wildcardNS in _namespaceList.Enumerate)
7171
{
72-
sb.Append(wildcardNS + ":*");
72+
sb.Append($"{wildcardNS}:*");
7373
if (i < _namespaceList.Enumerate.Count)
7474
{
7575
sb.Append(' ');

‎src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlSchemaDataType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ internal string TypeCodeString
106106
}
107107
else
108108
{
109-
typeCodeString = "List of " + TypeCodeToString(typeCode);
109+
typeCodeString = $"List of {TypeCodeToString(typeCode)}";
110110
}
111111
break;
112112

‎src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlSchemaException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ internal XmlSchemaException(string? res, string?[]? args, Exception? innerExcept
145145
}
146146
catch (MissingManifestResourceException)
147147
{
148-
return "UNKNOWN(" + res + ")";
148+
return $"UNKNOWN({res})";
149149
}
150150
}
151151

‎src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlSchemaValidator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2304,7 +2304,7 @@ private void ElementIdentityConstraints()
23042304
{
23052305
// selector selects new node, activate a new set of fields
23062306
Debug.WriteLine("Selector Match!");
2307-
Debug.WriteLine("Name: " + localName + "\t|\tURI: " + namespaceUri + "\n");
2307+
Debug.WriteLine($"Name: {localName}\t|\tURI: {namespaceUri}\n");
23082308

23092309
// in which axisFields got updated
23102310
constraintStructures[j].axisSelector.PushKS(_positionInfo.LineNumber, _positionInfo.LinePosition);
@@ -2366,7 +2366,7 @@ private void AttributeIdentityConstraints(string name, string? ns, object obj, s
23662366
//attribute is only simpletype, so needn't checking...
23672367
// can fill value here, yeah!!
23682368
Debug.WriteLine("Attribute Field Filling Value!");
2369-
Debug.WriteLine("Name: " + name + "\t|\tURI: " + ns + "\t|\tValue: " + obj + "\n");
2369+
Debug.WriteLine($"Name: {name}\t|\tURI: {ns}\t|\tValue: {obj}\n");
23702370
if (laxis.Ks[laxis.Column] != null)
23712371
{
23722372
// should be evaluated to either an empty node-set or a node-set with exactly one member
@@ -2411,7 +2411,7 @@ private void EndElementIdentityConstraints(object typedValue, string stringValue
24112411
if (laxis.isMatched)
24122412
{
24132413
Debug.WriteLine("Element Field Filling Value!");
2414-
Debug.WriteLine("Name: " + localName + "\t|\tURI: " + namespaceUri + "\t|\tValue: " + typedValue + "\n");
2414+
Debug.WriteLine($"Name: {localName}\t|\tURI: {namespaceUri}\t|\tValue: {typedValue}\n");
24152415
// fill value
24162416
laxis.isMatched = false;
24172417
if (laxis.Ks[laxis.Column] != null)
@@ -2821,7 +2821,7 @@ private static void EnumerateAny(StringBuilder builder, string namespaces)
28212821

28222822
internal static string QNameString(string localName, string ns)
28232823
{
2824-
return (ns.Length != 0) ? string.Concat(ns, ":", localName) : localName;
2824+
return (ns.Length != 0) ? $"{ns}:{localName}" : localName;
28252825
}
28262826

28272827
internal static string BuildElementName(XmlQualifiedName qname)

‎src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlValueConverter.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ protected XmlBaseConverter(XmlTypeCode typeCode)
264264
break;
265265

266266
default:
267-
Debug.Fail("Type code " + typeCode + " is not supported.");
267+
Debug.Fail($"Type code {typeCode} is not supported.");
268268
break;
269269
}
270270

@@ -475,15 +475,15 @@ protected static string QNameToString(XmlQualifiedName name)
475475
}
476476
else if (name.Namespace == XmlReservedNs.NsXs)
477477
{
478-
return "xs:" + name.Name;
478+
return $"xs:{name.Name}";
479479
}
480480
else if (name.Namespace == XmlReservedNs.NsXQueryDataType)
481481
{
482-
return "xdt:" + name.Name;
482+
return $"xdt:{name.Name}";
483483
}
484484
else
485485
{
486-
return "{" + name.Namespace + "}" + name.Name;
486+
return $"{{{name.Namespace}}}{name.Name}";
487487
}
488488
}
489489

@@ -745,13 +745,13 @@ protected static string QNameToString(XmlQualifiedName qname, IXmlNamespaceResol
745745
string? prefix;
746746

747747
if (nsResolver == null)
748-
return string.Concat("{", qname.Namespace, "}", qname.Name);
748+
return $"{{{qname.Namespace}}}{qname.Name}";
749749

750750
prefix = nsResolver.LookupPrefix(qname.Namespace);
751751
if (prefix == null)
752752
throw new InvalidCastException(SR.Format(SR.XmlConvert_TypeNoPrefix, qname, qname.Namespace));
753753

754-
return (prefix.Length != 0) ? string.Concat(prefix, ":", qname.Name) : qname.Name;
754+
return (prefix.Length != 0) ? $"{prefix}:{qname.Name}" : qname.Name;
755755
}
756756

757757
protected static string TimeToString(DateTime value)

‎src/libraries/System.Private.Xml/src/System/Xml/Schema/XsdBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ private XmlSchemaObject GetContainer(State state)
970970
container = _redefine!;
971971
break;
972972
default:
973-
Debug.Fail("State is " + state);
973+
Debug.Fail($"State is {state}");
974974
break;
975975
}
976976
return container;
@@ -1095,7 +1095,7 @@ private void SetContainer(State state, object container)
10951095
_redefine = (XmlSchemaRedefine)container;
10961096
break;
10971097
default:
1098-
Debug.Fail("State is " + state);
1098+
Debug.Fail($"State is {state}");
10991099
break;
11001100
}
11011101
}

0 commit comments

Comments
 (0)