admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use new string.Split() overloads (#11867)

Browse Source
This commit is contained in:
Ilya
2020-03-13 17:46:05 +05:00
committed by GitHub
parent e9152a59a5
commit 2e8ced4856
10 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.WSMan.Management/ConfigProvider.cs
+6 -6
View File
@@ -1977,8 +1977,8 @@ namespace Microsoft.WSMan.Management
helper.CreateWsManConnection(parametersetName, dynParams.ConnectionURI, dynParams.Port, Name, dynParams.ApplicationName, dynParams.UseSSL, dynParams.Authentication, dynParams.SessionOption, this.Credential, dynParams.CertificateThumbprint);
if (dynParams.ConnectionURI != null)
{
string[] constrsplit = dynParams.ConnectionURI.OriginalString.Split(new string[] { ":" + dynParams.Port + "/" + dynParams.ApplicationName }, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split(new string[] { "//" }, StringSplitOptions.None);
string[] constrsplit = dynParams.ConnectionURI.OriginalString.Split(":" + dynParams.Port + "/" + dynParams.ApplicationName, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split("//", StringSplitOptions.None);
Name = constrsplit1[1].Trim();
}
@@ -2526,9 +2526,9 @@ namespace Microsoft.WSMan.Management
private string GetRootNodeName(string ResourceURI)
{
string tempuri = string.Empty;
if (ResourceURI.Contains("?"))
if (ResourceURI.Contains('?'))
{
ResourceURI = ResourceURI.Split(new char[] { '?' }).GetValue(0).ToString();
ResourceURI = ResourceURI.Split('?').GetValue(0).ToString();
}
string PTRN_URI_LAST = "([a-z_][-a-z0-9._]*)$";
@@ -3164,8 +3164,8 @@ namespace Microsoft.WSMan.Management
if (!string.IsNullOrEmpty(existingvalue))
{
string[] existingsplitvalues = existingvalue.Split(new string[] { Delimiter }, StringSplitOptions.None);
string[] newvalues = value.Split(new string[] { Delimiter }, StringSplitOptions.None);
string[] existingsplitvalues = existingvalue.Split(Delimiter, StringSplitOptions.None);
string[] newvalues = value.Split(Delimiter, StringSplitOptions.None);
foreach (string val in newvalues)
{
if (Array.IndexOf(existingsplitvalues, val) == -1)
src/Microsoft.WSMan.Management/WSManConnections.cs
+2 -2
View File
@@ -259,8 +259,8 @@ namespace Microsoft.WSMan.Management
try
{
// always in the format http://server:port/applicationname
string[] constrsplit = connectionuri.OriginalString.Split(new string[] { ":" + port + "/" + applicationname }, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split(new string[] { "//" }, StringSplitOptions.None);
string[] constrsplit = connectionuri.OriginalString.Split(":" + port + "/" + applicationname, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split("//", StringSplitOptions.None);
computername = constrsplit1[1].Trim();
}
catch (IndexOutOfRangeException)
src/Microsoft.WSMan.Management/WSManInstance.cs
+8 -8
View File
@@ -528,8 +528,8 @@ namespace Microsoft.WSMan.Management
try
{
// in the format http(s)://server[:port/applicationname]
string[] constrsplit = connectionuri.OriginalString.Split(new string[] { ":" + port + "/" + applicationname }, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split(new string[] { "//" }, StringSplitOptions.None);
string[] constrsplit = connectionuri.OriginalString.Split(":" + port + "/" + applicationname, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split("//", StringSplitOptions.None);
computername = constrsplit1[1].Trim();
}
catch (IndexOutOfRangeException)
@@ -908,8 +908,8 @@ namespace Microsoft.WSMan.Management
try
{
// in the format http(s)://server[:port/applicationname]
string[] constrsplit = connectionuri.OriginalString.Split(new string[] { ":" + port + "/" + applicationname }, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split(new string[] { "//" }, StringSplitOptions.None);
string[] constrsplit = connectionuri.OriginalString.Split(":" + port + "/" + applicationname, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split("//", StringSplitOptions.None);
computername = constrsplit1[1].Trim();
}
catch (IndexOutOfRangeException)
@@ -1202,8 +1202,8 @@ namespace Microsoft.WSMan.Management
try
{
// in the format http(s)://server[:port/applicationname]
string[] constrsplit = connectionuri.OriginalString.Split(new string[] { ":" + port + "/" + applicationname }, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split(new string[] { "//" }, StringSplitOptions.None);
string[] constrsplit = connectionuri.OriginalString.Split(":" + port + "/" + applicationname, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split("//", StringSplitOptions.None);
computername = constrsplit1[1].Trim();
}
catch (IndexOutOfRangeException)
@@ -1491,8 +1491,8 @@ namespace Microsoft.WSMan.Management
try
{
// in the format http(s)://server[:port/applicationname]
string[] constrsplit = connectionuri.OriginalString.Split(new string[] { ":" + port + "/" + applicationname }, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split(new string[] { "//" }, StringSplitOptions.None);
string[] constrsplit = connectionuri.OriginalString.Split(":" + port + "/" + applicationname, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split("//", StringSplitOptions.None);
computername = constrsplit1[1].Trim();
}
catch (IndexOutOfRangeException)
src/Microsoft.WSMan.Management/WsManHelper.cs
+4 -4
View File
@@ -953,8 +953,8 @@ namespace Microsoft.WSMan.Management
if (connectionuri != null)
{
// in the format http(s)://server[:port/applicationname]
string[] constrsplit = connectionStr.Split(new string[] { ":" + port + "/" + applicationname }, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split(new string[] { "//" }, StringSplitOptions.None);
string[] constrsplit = connectionStr.Split(":" + port + "/" + applicationname, StringSplitOptions.None);
string[] constrsplit1 = constrsplit[0].Split("//", StringSplitOptions.None);
computername = constrsplit1[1].Trim();
}
@@ -1098,10 +1098,10 @@ namespace Microsoft.WSMan.Management
string Line = _sr.ReadLine();
if (Line.Contains("="))
{
string[] arr = Line.Split(new char[] { '=' }, 2);
string[] arr = Line.Split('=', count: 2);
if (!ResourceValueCache.ContainsKey(arr[0].Trim()))
{
string value = arr[1].TrimStart(new char[] { '"' }).TrimEnd(new char[] { '"' });
string value = arr[1].Trim('"');
ResourceValueCache.Add(arr[0].Trim(), value.Trim());
}
}
src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace System.Management.Automation
}
else
{
_probingPaths = basePaths.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
_probingPaths = basePaths.Split(';', StringSplitOptions.RemoveEmptyEntries);
for (int i = 0; i < _probingPaths.Length; i++)
{
string basePath = _probingPaths[i];
src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
+5 -5
View File
@@ -785,7 +785,7 @@ namespace System.Management.Automation
return username;
}
// Get and add the user name to the cache so we don't need to
// Get and add the user name to the cache so we don't need to
// have a pinvoke for each file.
username = NativeMethods.GetPwUid(UserId);
usernameCache.Add(UserId, username);
@@ -805,7 +805,7 @@ namespace System.Management.Automation
return groupname;
}
// Get and add the group name to the cache so we don't need to
// Get and add the group name to the cache so we don't need to
// have a pinvoke for each file.
groupname = NativeMethods.GetGrGid(GroupId);
groupnameCache.Add(GroupId, groupname);
@@ -976,7 +976,7 @@ namespace System.Management.Automation
try
{
var stat = System.IO.File.ReadAllText(path);
var parts = stat.Split(new[] { ' ' }, 5);
var parts = stat.Split(' ', 5);
if (parts.Length < 5)
{
return invalidPid;
@@ -1092,8 +1092,8 @@ namespace System.Management.Automation
/// <summary>
/// This is a struct from getcommonstat.h in the native library.
/// It presents each member of the stat structure as the largest type of that member across
/// all stat structures on the platforms we support. This allows us to present a common
/// It presents each member of the stat structure as the largest type of that member across
/// all stat structures on the platforms we support. This allows us to present a common
/// stat structure for all our platforms.
/// </summary>
[StructLayout(LayoutKind.Sequential)]
src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+3 -3
View File
@@ -1687,7 +1687,7 @@ namespace System.Management.Automation
string enumString = LanguagePrimitives.EnumSingleTypeConverter.EnumValues(parameterType);
string separator = CultureInfo.CurrentUICulture.TextInfo.ListSeparator;
string[] enumArray = enumString.Split(new string[] { separator }, StringSplitOptions.RemoveEmptyEntries);
string[] enumArray = enumString.Split(separator, StringSplitOptions.RemoveEmptyEntries);
string wordToComplete = context.WordToComplete;
string quote = HandleDoubleAndSingleQuote(ref wordToComplete);
@@ -6151,7 +6151,7 @@ namespace System.Management.Automation
string enumString = LanguagePrimitives.EnumSingleTypeConverter.EnumValues(typeof(SwitchFlags));
string separator = CultureInfo.CurrentUICulture.TextInfo.ListSeparator;
string[] enumArray = enumString.Split(new string[] { separator }, StringSplitOptions.RemoveEmptyEntries);
string[] enumArray = enumString.Split(separator, StringSplitOptions.RemoveEmptyEntries);
var pattern = WildcardPattern.Get(wordToComplete + "*", WildcardOptions.IgnoreCase);
var enumList = new List<string>();
@@ -6626,7 +6626,7 @@ namespace System.Management.Automation
string tooltip = memberInfo.ToString();
if (tooltip.IndexOf("),", StringComparison.Ordinal) != -1)
{
var overloads = tooltip.Split(new[] { ")," }, StringSplitOptions.RemoveEmptyEntries);
var overloads = tooltip.Split("),", StringSplitOptions.RemoveEmptyEntries);
var newTooltip = new StringBuilder();
foreach (var overload in overloads)
{
src/System.Management.Automation/engine/hostifaces/NativeCultureResolver.cs
+1 -2
View File
@@ -236,8 +236,7 @@ namespace Microsoft.PowerShell
{
try
{
string[] fallbacks = langBuffer.Split(new char[] { '\0' },
StringSplitOptions.RemoveEmptyEntries);
string[] fallbacks = langBuffer.Split('\0', StringSplitOptions.RemoveEmptyEntries);
string fallback = fallbacks[0];
string[] fallbacksForParent = null;
src/System.Management.Automation/engine/remoting/fanin/PSSessionConfigurationData.cs
+1 -1
View File
@@ -189,7 +189,7 @@ namespace System.Management.Automation.Remoting
AssertValueNotAssigned(ModulesToImportToken, _modulesToImport);
_modulesToImport = new List<string>();
_modulesToImportInternal = new List<object>();
object[] modulesToImport = optionValue.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
object[] modulesToImport = optionValue.Split(',', StringSplitOptions.RemoveEmptyEntries);
foreach (var module in modulesToImport)
{
var s = module as string;
src/TypeCatalogGen/TypeCatalogGen.cs
+1 -1
View File
@@ -384,7 +384,7 @@ DUPLICATE key '{fullName}' from '{strongAssemblyName}' (IsObsolete? {isTypeObsol
}
string allText = File.ReadAllText(referenceListPath);
string[] references = allText.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
string[] references = allText.Split(';', StringSplitOptions.RemoveEmptyEntries);
List<string> refAssemblyFiles = new List<string>(120);
for (int i = 0; i < references.Length; i++)