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

91 files changed

Lines changed: 401 additions & 409 deletions

File tree

Some content is hidden

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

‎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)

0 commit comments

Comments
 (0)