Use params and char overload (#4231)

ThomasGoulet73 · web-flow · commit 7852ebf3af31 · 2022-08-10T14:56:56.000+05:30
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs
@@ -1477,7 +1477,7 @@ internal string GetGenericTypeName(string typeName, string typeArgs)
             StringBuilder sb = new StringBuilder(typeName, 20);
             sb.Append(GENERIC_DELIMITER);
 
-            _typeArgsList = typeArgs.Split(new Char[] { COMMA });
+            _typeArgsList = typeArgs.Split(COMMA);
 
             sb.Append(_typeArgsList.Length);
 
@@ -1537,7 +1537,7 @@ private bool IsValidCLRNamespace(string ns, bool shouldThrow)
         {
             if (ns.Length > 0)
             {
-                string[] nsParts = ns.Split(new char[] { DOTCHAR });
+                string[] nsParts = ns.Split(DOTCHAR);
 
                 foreach (string nsPart in nsParts)
                 {
@@ -1629,7 +1629,7 @@ private string ParentFolderPrefix
                     {
                         string relPath = TargetPath.Substring(SourceFileInfo.SourcePath.Length);
                         relPath += SourceFileInfo.RelativeSourceFilePath;
-                        string[] dirs = relPath.Split(new Char[] { Path.DirectorySeparatorChar });
+                        string[] dirs = relPath.Split(Path.DirectorySeparatorChar);
                         for (int i = 1; i < dirs.Length; i++)
                         {
                             parentFolderPrefix += PARENTFOLDER;
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/RepeatBehaviorConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/RepeatBehaviorConverter.cs
@@ -21,7 +21,7 @@ public sealed class RepeatBehaviorConverter : TypeConverter
     {
         #region Data
 
-        private static char[] _iterationCharacter = new char[] { 'x' };
+        private const char _iterationCharacter = 'x';
 
         #endregion
 
@@ -81,7 +81,7 @@ public override object ConvertFrom(
                     return RepeatBehavior.Forever;
                 }
                 else if (   stringValue.Length > 0
-                         && stringValue[stringValue.Length - 1] == _iterationCharacter[0])
+                         && stringValue[stringValue.Length - 1] == _iterationCharacter)
                 {
                     string stringDoubleValue = stringValue.TrimEnd(_iterationCharacter);
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Parsers.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Parsers.cs
@@ -105,7 +105,7 @@ static private Color ParseContextColor(string trimmedColor, IFormatProvider form
 
             string tokens = trimmedColor.Substring(s_ContextColor.Length);
             tokens = tokens.Trim();
-            string[] preSplit = tokens.Split(new Char[] { ' ' });
+            string[] preSplit = tokens.Split(' ');
             if (preSplit.GetLength(0)< 2)
             {
                 throw new FormatException(SR.Get(SRID.Parsers_IllegalToken));
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Navigation/BaseUriHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Navigation/BaseUriHelper.cs
@@ -285,7 +285,7 @@ internal static void GetAssemblyNameAndPart(Uri uri, out string partName, out st
 
             if (fHasComponent)
             {
-                string[] assemblyInfo = firstSegment.Split(new char[] { COMPONENT_DELIMITER });
+                string[] assemblyInfo = firstSegment.Split(COMPONENT_DELIMITER);
 
                 int count = assemblyInfo.Length;
 
@@ -336,7 +336,7 @@ static internal bool IsComponentEntryAssembly(string component)
         {
             if (component.EndsWith(COMPONENT, StringComparison.OrdinalIgnoreCase))
             {
-                string[] assemblyInfo = component.Split(new Char[] { COMPONENT_DELIMITER });
+                string[] assemblyInfo = component.Split(COMPONENT_DELIMITER);
                 // Check whether the assembly name is the same as the EntryAssembly.
                 int count = assemblyInfo.Length;
                 if ((count >= 2) && (count <= 4))
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/FixedTextSelectionProcessor.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/FixedTextSelectionProcessor.cs
@@ -222,20 +222,20 @@ public override IList<ContentLocatorPart>
                     string value = "";
                     if (!double.IsNaN(fp.Segments[i].Start.X))
                     {
-                        value += fp.Segments[i].Start.X.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator[0] + fp.Segments[i].Start.Y.ToString(NumberFormatInfo.InvariantInfo);
+                        value += fp.Segments[i].Start.X.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator + fp.Segments[i].Start.Y.ToString(NumberFormatInfo.InvariantInfo);
                     }
                     else
                     {
-                        value += TextSelectionProcessor.Separator[0];
+                        value += TextSelectionProcessor.Separator;
                     }
-                    value += TextSelectionProcessor.Separator[0];
+                    value += TextSelectionProcessor.Separator;
                     if (!double.IsNaN(fp.Segments[i].End.X))
                     {
-                        value += fp.Segments[i].End.X.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator[0] + fp.Segments[i].End.Y.ToString(NumberFormatInfo.InvariantInfo);
+                        value += fp.Segments[i].End.X.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator + fp.Segments[i].End.Y.ToString(NumberFormatInfo.InvariantInfo);
                     }
                     else
                     {
-                        value += TextSelectionProcessor.Separator[0];
+                        value += TextSelectionProcessor.Separator;
                     }
 
                     part.NameValuePairs.Add(TextSelectionProcessor.SegmentAttribute + i.ToString(NumberFormatInfo.InvariantInfo), value);
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/TextSelectionProcessor.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/TextSelectionProcessor.cs
@@ -169,7 +169,7 @@ public override IList<ContentLocatorPart>
             {
                 GetTextSegmentValues(textSegments[i], elementStart, elementEnd, out startOffset, out endOffset);
 
-                part.NameValuePairs.Add(SegmentAttribute + i.ToString(NumberFormatInfo.InvariantInfo), startOffset.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator[0] + endOffset.ToString(NumberFormatInfo.InvariantInfo));
+                part.NameValuePairs.Add(SegmentAttribute + i.ToString(NumberFormatInfo.InvariantInfo), startOffset.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator + endOffset.ToString(NumberFormatInfo.InvariantInfo));
             }
 
             part.NameValuePairs.Add(CountAttribute, textSegments.Count.ToString(NumberFormatInfo.InvariantInfo));
@@ -424,7 +424,7 @@ internal void SetTargetDocumentPageView(DocumentPageView target)
         internal const String IncludeOverlaps = "IncludeOverlaps";
 
         // Potential separators for values in segment name/value pairs
-        internal static readonly Char[] Separator = new Char[] { ',' };
+        internal const Char Separator = ',';
 
         // Name of locator part element
         internal static readonly XmlQualifiedName CharacterRangeElementName = new XmlQualifiedName("CharacterRange", AnnotationXmlConstants.Namespaces.BaseSchemaNamespace);
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/TextViewSelectionProcessor.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/TextViewSelectionProcessor.cs
@@ -158,7 +158,7 @@ public override IList<ContentLocatorPart>
 
             ContentLocatorPart part = new ContentLocatorPart(TextSelectionProcessor.CharacterRangeElementName);// DocumentPageViewLocatorPart();
             part.NameValuePairs.Add(TextSelectionProcessor.CountAttribute, 1.ToString(NumberFormatInfo.InvariantInfo));
-            part.NameValuePairs.Add(TextSelectionProcessor.SegmentAttribute + 0.ToString(NumberFormatInfo.InvariantInfo), startOffset.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator[0] + endOffset.ToString(NumberFormatInfo.InvariantInfo));
+            part.NameValuePairs.Add(TextSelectionProcessor.SegmentAttribute + 0.ToString(NumberFormatInfo.InvariantInfo), startOffset.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator + endOffset.ToString(NumberFormatInfo.InvariantInfo));
             part.NameValuePairs.Add(TextSelectionProcessor.IncludeOverlaps, Boolean.TrueString);
 
             res.Add(part);
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Microsoft/Win32/FileDialog.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Microsoft/Win32/FileDialog.cs
@@ -1611,7 +1611,7 @@ private string[] GetFilterExtensions()
             if (filter != null)
             {
                 // Filter strings are '|' delimited, so we split on them
-                string[] tokens = filter.Split(new char[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
+                string[] tokens = filter.Split('|', StringSplitOptions.RemoveEmptyEntries);
 
                 // Calculate the index of the token containing extension(s) selected
                 // by the FilterIndex property.  Remember FilterIndex is one based.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Annotations/Annotation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Annotations/Annotation.cs
@@ -966,7 +966,7 @@ private void Init()
         /// <summary>
         /// Colon used to split the parts of a qualified name attribute value
         /// </summary>
-        private static readonly char[] _Colon = new char[] { ':' };
+        private const char _Colon = ':';
 
         #endregion Private Fields
     }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ColorConvertedBitmapExtension.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ColorConvertedBitmapExtension.cs
@@ -47,7 +47,7 @@ public ColorConvertedBitmapExtension(
                 throw new ArgumentNullException("image");
             }
 
-            string[] tokens = ((string)image).Split(new char[] { ' ' });
+            string[] tokens = ((string)image).Split(' ');
 
             foreach (string str in tokens)
             {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlRecords.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlRecords.cs
@@ -2528,7 +2528,7 @@ internal override void WriteRecordData(BinaryWriter bamlBinaryWriter)
             if (ValueType != null && ValueType.IsEnum)
             {
                 uint uintValue = 0;
-                string [] enumValues = Value.Split(new Char[] { ',' });
+                string [] enumValues = Value.Split(',');
 
                 // if the Enum is a flag, then resolve each flag value in the enum value string.
                 foreach (string enumValue in enumValues)
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/Compoundfile/ContainerUtilities.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/Compoundfile/ContainerUtilities.cs
@@ -45,7 +45,6 @@ static internal class ContainerUtilities
         /// Used by ConvertBackSlashPathToStringArrayPath and 
         ///     ConvertStringArrayPathToBackSlashPath to separate path elements.
         static readonly internal char PathSeparator = Path.DirectorySeparatorChar;
-        static private readonly char[] _PathSeparatorArray = new char[] { PathSeparator };
         static readonly internal string PathSeparatorAsString = new string(ContainerUtilities.PathSeparator, 1);
 
         static private readonly CaseInsensitiveOrdinalStringComparer _stringCaseInsensitiveComparer = new CaseInsensitiveOrdinalStringComparer();
@@ -347,7 +346,7 @@ static internal string[] ConvertBackSlashPathToStringArrayPath(string backSlashP
 
             // Build the array
             string[] splitArray =
-                backSlashPath.Split(_PathSeparatorArray);
+                backSlashPath.Split(PathSeparator);
 
             // Look for empty strings in the array
             foreach (string arrayElement in splitArray)

Original file line number	Diff line number	Diff line change
`@@ -1477,7 +1477,7 @@ internal string GetGenericTypeName(string typeName, string typeArgs)`
`1477`	`1477`	`StringBuilder sb = new StringBuilder(typeName, 20);`
`1478`	`1478`	`sb.Append(GENERIC_DELIMITER);`
`1479`	`1479`
`1480`		`- _typeArgsList = typeArgs.Split(new Char[] { COMMA });`
	`1480`	`+ _typeArgsList = typeArgs.Split(COMMA);`
`1481`	`1481`
`1482`	`1482`	`sb.Append(_typeArgsList.Length);`
`1483`	`1483`
`@@ -1537,7 +1537,7 @@ private bool IsValidCLRNamespace(string ns, bool shouldThrow)`
`1537`	`1537`	`{`
`1538`	`1538`	`if (ns.Length > 0)`
`1539`	`1539`	`{`
`1540`		`- string[] nsParts = ns.Split(new char[] { DOTCHAR });`
	`1540`	`+ string[] nsParts = ns.Split(DOTCHAR);`
`1541`	`1541`
`1542`	`1542`	`foreach (string nsPart in nsParts)`
`1543`	`1543`	`{`
`@@ -1629,7 +1629,7 @@ private string ParentFolderPrefix`
`1629`	`1629`	`{`
`1630`	`1630`	`string relPath = TargetPath.Substring(SourceFileInfo.SourcePath.Length);`
`1631`	`1631`	`relPath += SourceFileInfo.RelativeSourceFilePath;`
`1632`		`- string[] dirs = relPath.Split(new Char[] { Path.DirectorySeparatorChar });`
	`1632`	`+ string[] dirs = relPath.Split(Path.DirectorySeparatorChar);`
`1633`	`1633`	`for (int i = 1; i < dirs.Length; i++)`
`1634`	`1634`	`{`
`1635`	`1635`	`parentFolderPrefix += PARENTFOLDER;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public sealed class RepeatBehaviorConverter : TypeConverter`
`21`	`21`	`{`
`22`	`22`	`#region Data`
`23`	`23`
`24`		`- private static char[] _iterationCharacter = new char[] { 'x' };`
	`24`	`+ private const char _iterationCharacter = 'x';`
`25`	`25`
`26`	`26`	`#endregion`
`27`	`27`
`@@ -81,7 +81,7 @@ public override object ConvertFrom(`
`81`	`81`	`return RepeatBehavior.Forever;`
`82`	`82`	`}`
`83`	`83`	`else if ( stringValue.Length > 0`
`84`		`- && stringValue[stringValue.Length - 1] == _iterationCharacter[0])`
	`84`	`+ && stringValue[stringValue.Length - 1] == _iterationCharacter)`
`85`	`85`	`{`
`86`	`86`	`string stringDoubleValue = stringValue.TrimEnd(_iterationCharacter);`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ static private Color ParseContextColor(string trimmedColor, IFormatProvider form`
`105`	`105`
`106`	`106`	`string tokens = trimmedColor.Substring(s_ContextColor.Length);`
`107`	`107`	`tokens = tokens.Trim();`
`108`		`- string[] preSplit = tokens.Split(new Char[] { ' ' });`
	`108`	`+ string[] preSplit = tokens.Split(' ');`
`109`	`109`	`if (preSplit.GetLength(0)< 2)`
`110`	`110`	`{`
`111`	`111`	`throw new FormatException(SR.Get(SRID.Parsers_IllegalToken));`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ internal static void GetAssemblyNameAndPart(Uri uri, out string partName, out st`
`285`	`285`
`286`	`286`	`if (fHasComponent)`
`287`	`287`	`{`
`288`		`- string[] assemblyInfo = firstSegment.Split(new char[] { COMPONENT_DELIMITER });`
	`288`	`+ string[] assemblyInfo = firstSegment.Split(COMPONENT_DELIMITER);`
`289`	`289`
`290`	`290`	`int count = assemblyInfo.Length;`
`291`	`291`
`@@ -336,7 +336,7 @@ static internal bool IsComponentEntryAssembly(string component)`
`336`	`336`	`{`
`337`	`337`	`if (component.EndsWith(COMPONENT, StringComparison.OrdinalIgnoreCase))`
`338`	`338`	`{`
`339`		`- string[] assemblyInfo = component.Split(new Char[] { COMPONENT_DELIMITER });`
	`339`	`+ string[] assemblyInfo = component.Split(COMPONENT_DELIMITER);`
`340`	`340`	`// Check whether the assembly name is the same as the EntryAssembly.`
`341`	`341`	`int count = assemblyInfo.Length;`
`342`	`342`	`if ((count >= 2) && (count <= 4))`
Original file line number	Diff line number	Diff line change
`@@ -222,20 +222,20 @@ public override IList<ContentLocatorPart>`
`222`	`222`	`string value = "";`
`223`	`223`	`if (!double.IsNaN(fp.Segments[i].Start.X))`
`224`	`224`	`{`
`225`		`- value += fp.Segments[i].Start.X.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator[0] + fp.Segments[i].Start.Y.ToString(NumberFormatInfo.InvariantInfo);`
	`225`	`+ value += fp.Segments[i].Start.X.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator + fp.Segments[i].Start.Y.ToString(NumberFormatInfo.InvariantInfo);`
`226`	`226`	`}`
`227`	`227`	`else`
`228`	`228`	`{`
`229`		`- value += TextSelectionProcessor.Separator[0];`
	`229`	`+ value += TextSelectionProcessor.Separator;`
`230`	`230`	`}`
`231`		`- value += TextSelectionProcessor.Separator[0];`
	`231`	`+ value += TextSelectionProcessor.Separator;`
`232`	`232`	`if (!double.IsNaN(fp.Segments[i].End.X))`
`233`	`233`	`{`
`234`		`- value += fp.Segments[i].End.X.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator[0] + fp.Segments[i].End.Y.ToString(NumberFormatInfo.InvariantInfo);`
	`234`	`+ value += fp.Segments[i].End.X.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator + fp.Segments[i].End.Y.ToString(NumberFormatInfo.InvariantInfo);`
`235`	`235`	`}`
`236`	`236`	`else`
`237`	`237`	`{`
`238`		`- value += TextSelectionProcessor.Separator[0];`
	`238`	`+ value += TextSelectionProcessor.Separator;`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`part.NameValuePairs.Add(TextSelectionProcessor.SegmentAttribute + i.ToString(NumberFormatInfo.InvariantInfo), value);`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public override IList<ContentLocatorPart>`
`169`	`169`	`{`
`170`	`170`	`GetTextSegmentValues(textSegments[i], elementStart, elementEnd, out startOffset, out endOffset);`
`171`	`171`
`172`		`- part.NameValuePairs.Add(SegmentAttribute + i.ToString(NumberFormatInfo.InvariantInfo), startOffset.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator[0] + endOffset.ToString(NumberFormatInfo.InvariantInfo));`
	`172`	`+ part.NameValuePairs.Add(SegmentAttribute + i.ToString(NumberFormatInfo.InvariantInfo), startOffset.ToString(NumberFormatInfo.InvariantInfo) + TextSelectionProcessor.Separator + endOffset.ToString(NumberFormatInfo.InvariantInfo));`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`part.NameValuePairs.Add(CountAttribute, textSegments.Count.ToString(NumberFormatInfo.InvariantInfo));`
`@@ -424,7 +424,7 @@ internal void SetTargetDocumentPageView(DocumentPageView target)`
`424`	`424`	`internal const String IncludeOverlaps = "IncludeOverlaps";`
`425`	`425`
`426`	`426`	`// Potential separators for values in segment name/value pairs`
`427`		`- internal static readonly Char[] Separator = new Char[] { ',' };`
	`427`	`+ internal const Char Separator = ',';`
`428`	`428`
`429`	`429`	`// Name of locator part element`
`430`	`430`	`internal static readonly XmlQualifiedName CharacterRangeElementName = new XmlQualifiedName("CharacterRange", AnnotationXmlConstants.Namespaces.BaseSchemaNamespace);`
Original file line number	Diff line number	Diff line change
`@@ -1611,7 +1611,7 @@ private string[] GetFilterExtensions()`
`1611`	`1611`	`if (filter != null)`
`1612`	`1612`	`{`
`1613`	`1613`	`// Filter strings are '\|' delimited, so we split on them`
`1614`		`- string[] tokens = filter.Split(new char[] { '\|' }, StringSplitOptions.RemoveEmptyEntries);`
	`1614`	`+ string[] tokens = filter.Split('\|', StringSplitOptions.RemoveEmptyEntries);`
`1615`	`1615`
`1616`	`1616`	`// Calculate the index of the token containing extension(s) selected`
`1617`	`1617`	`// by the FilterIndex property. Remember FilterIndex is one based.`
Original file line number	Diff line number	Diff line change
`@@ -966,7 +966,7 @@ private void Init()`
`966`	`966`	`/// <summary>`
`967`	`967`	`/// Colon used to split the parts of a qualified name attribute value`
`968`	`968`	`/// </summary>`
`969`		`- private static readonly char[] _Colon = new char[] { ':' };`
	`969`	`+ private const char _Colon = ':';`
`970`	`970`
`971`	`971`	`#endregion Private Fields`
`972`	`972`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public ColorConvertedBitmapExtension(`
`47`	`47`	`throw new ArgumentNullException("image");`
`48`	`48`	`}`
`49`	`49`
`50`		`- string[] tokens = ((string)image).Split(new char[] { ' ' });`
	`50`	`+ string[] tokens = ((string)image).Split(' ');`
`51`	`51`
`52`	`52`	`foreach (string str in tokens)`
`53`	`53`	`{`