Skip to content

Use new string.Split() overloads #11867

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

Merged
iSazonov merged 3 commits into from
Mar 13, 2020
Merged

Use new string.Split() overloads #11867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce98103
Use new string.Split() overloads
iSazonov Feb 17, 2020
153ddea
Add name to parameter
iSazonov Feb 19, 2020
29c9d27
Address feedback
iSazonov Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/Microsoft.WSMan.Management/ConfigProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1977,8 +1977,8 @@ private void NewItemCreateComputerConnection(string Name)
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();
}

Expand Down Expand Up @@ -2526,9 +2526,9 @@ private string GetHostName(string path)
private string GetRootNodeName(string ResourceURI)
{
string tempuri = string.Empty;
if (ResourceURI.Contains("?"))
if (ResourceURI.Contains('?'))
Copy link
Collaborator

@rjmholt rjmholt Feb 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a LINQ usage now? I think it's probably best to keep it as a string

Copy link
Collaborator

@rjmholt rjmholt Feb 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But if it's not LINQ, then no issues

Copy link
Collaborator Author

@iSazonov iSazonov Feb 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it is String method:

public bool Contains(char value);

Copy link
Collaborator

@rjmholt rjmholt Feb 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, looks good

{
ResourceURI = ResourceURI.Split(new char[] { '?' }).GetValue(0).ToString();
ResourceURI = ResourceURI.Split('?').GetValue(0).ToString();
}

string PTRN_URI_LAST = "([a-z_][-a-z0-9._]*)$";
Expand Down Expand Up @@ -3164,8 +3164,8 @@ private string SplitAndUpdateStringUsingDelimiter(object sessionobj, string uri,

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)
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.WSMan.Management/WSManConnections.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ protected override void BeginProcessing()
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)
Expand Down
16 changes: 8 additions & 8 deletions src/Microsoft.WSMan.Management/WSManInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,8 +528,8 @@ protected override void ProcessRecord()
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)
Expand Down Expand Up @@ -908,8 +908,8 @@ protected override void ProcessRecord()
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)
Expand Down Expand Up @@ -1202,8 +1202,8 @@ protected override void ProcessRecord()
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)
Expand Down Expand Up @@ -1491,8 +1491,8 @@ protected override void BeginProcessing()
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)
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.WSMan.Management/WsManHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,8 +953,8 @@ internal void CreateWsManConnection(string ParameterSetName, Uri connectionuri,
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();
}

Expand Down Expand Up @@ -1098,10 +1098,10 @@ internal static void LoadResourceData()
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());
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private PowerShellAssemblyLoadContext(string basePaths)
}
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];
Expand Down
10 changes: 5 additions & 5 deletions src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ public string GetUserName()
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);
Expand All @@ -805,7 +805,7 @@ public string GetGroupName()
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);
Expand Down Expand Up @@ -976,7 +976,7 @@ public static int GetProcFSParentPid(int pid)
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;
Expand Down Expand Up @@ -1092,8 +1092,8 @@ internal static extern int GetInodeData([MarshalAs(UnmanagedType.LPStr)]string p

/// <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)]
Expand Down
6 changes: 3 additions & 3 deletions src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,7 +1687,7 @@ private static void ProcessParameter(

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);
Expand Down Expand Up @@ -6151,7 +6151,7 @@ internal static List<CompletionResult> CompleteStatementFlags(TokenKind kind, st

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>();
Expand Down Expand Up @@ -6626,7 +6626,7 @@ internal static void CompleteMemberHelper(
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)
{
Expand Down
3 changes: 1 addition & 2 deletions src/System.Management.Automation/engine/hostifaces/NativeCultureResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,7 @@ internal static CultureInfo GetUICulture(bool filterOutNonConsoleCultures)
{
try
{
string[] fallbacks = langBuffer.Split(new char[] { '\0' },
StringSplitOptions.RemoveEmptyEntries);
string[] fallbacks = langBuffer.Split('\0', StringSplitOptions.RemoveEmptyEntries);
string fallback = fallbacks[0];
string[] fallbacksForParent = null;

Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/remoting/fanin/PSSessionConfigurationData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ private void Update(string optionName, string optionValue)
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;
Expand Down
2 changes: 1 addition & 1 deletion src/TypeCatalogGen/TypeCatalogGen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ private static List<string> ResolveReferenceAssemblies(string path)
}

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++)
Expand Down