Skip to content

Code cleanup: use IndexOf(char) overload #9722

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
Jun 26, 2019
Merged

Code cleanup: use IndexOf(char) overload #9722

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
9495009
Code cleanup: use IndexOf(char) overload
iSazonov May 24, 2019
4f7d8de
Add fix in FileSystemProvider
iSazonov May 24, 2019
73ea752
Revert CertificateProvider
iSazonov Jun 23, 2019
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
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1808,7 +1808,7 @@ internal static string GetLocalAdminUserName(string computerName, PSCredential p
}
else
{
int dotIndex = computerName.IndexOf(".", StringComparison.OrdinalIgnoreCase);
int dotIndex = computerName.IndexOf('.');
if (dotIndex == -1)
{
localUserName = computerName + "\\" + psLocalCredential.UserName;
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.PowerShell.Commands.Management/commands/management/ControlPanelItemCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ private static bool CompareVerbActionOpen(string verbActionName)
{
string canonicalName = (string)item.ExtendedProperty("System.ApplicationName");
canonicalName = !string.IsNullOrEmpty(canonicalName)
? canonicalName.Substring(0, canonicalName.IndexOf("\0", StringComparison.OrdinalIgnoreCase))
? canonicalName.Substring(0, canonicalName.IndexOf('\0'))
: null;

if (canonicalName != null && canonicalName.Equals(RegionCanonicalName, StringComparison.OrdinalIgnoreCase))
Expand Down Expand Up @@ -452,7 +452,7 @@ internal List<ShellFolderItem> GetControlPanelItemByCanonicalName(List<ShellFold
string path = item.Path;
string canonicalName = (string)item.ExtendedProperty("System.ApplicationName");
canonicalName = canonicalName != null
? canonicalName.Substring(0, canonicalName.IndexOf("\0", StringComparison.OrdinalIgnoreCase))
? canonicalName.Substring(0, canonicalName.IndexOf('\0'))
: null;

if (canonicalName == null)
Expand Down Expand Up @@ -640,7 +640,7 @@ protected override void ProcessRecord()
string description = (string)item.ExtendedProperty("InfoTip");
string canonicalName = (string)item.ExtendedProperty("System.ApplicationName");
canonicalName = canonicalName != null
? canonicalName.Substring(0, canonicalName.IndexOf("\0", StringComparison.OrdinalIgnoreCase))
? canonicalName.Substring(0, canonicalName.IndexOf('\0'))
: null;
int[] categories = (int[])item.ExtendedProperty("System.ControlPanel.Category");
string[] cateStrings = new string[categories.Length];
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.PowerShell.Commands.Management/commands/management/ParsePathCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ protected override void ProcessRecord()
continue;

case qualifierSet:
int separatorIndex = pathsToParse[index].IndexOf(":", StringComparison.CurrentCulture);
int separatorIndex = pathsToParse[index].IndexOf(':');

if (separatorIndex < 0)
{
Expand Down Expand Up @@ -449,7 +449,7 @@ private string RemoveQualifier(string path)

if (SessionState.Path.IsProviderQualified(path))
{
int index = path.IndexOf("::", StringComparison.CurrentCulture);
int index = path.IndexOf("::", StringComparison.Ordinal);

if (index != -1)
{
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -6604,7 +6604,7 @@ internal static void CompleteMemberHelper(
}

string tooltip = memberInfo.ToString();
if (tooltip.IndexOf("),", StringComparison.OrdinalIgnoreCase) != -1)
if (tooltip.IndexOf("),", StringComparison.Ordinal) != -1)
{
var overloads = tooltip.Split(new[] { ")," }, StringSplitOptions.RemoveEmptyEntries);
var newTooltip = new StringBuilder();
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/LanguagePrimitives.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1503,7 +1503,7 @@ internal static object GetConverter(Type type, TypeTable backupTypeTable)

private static object NewConverterInstance(string assemblyQualifiedTypeName)
{
int typeSeparator = assemblyQualifiedTypeName.IndexOf(",", StringComparison.Ordinal);
int typeSeparator = assemblyQualifiedTypeName.IndexOf(',');
if (typeSeparator == -1)
{
typeConversion.WriteLine("Type name \"{0}\" should be assembly qualified.", assemblyQualifiedTypeName);
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4689,7 +4689,7 @@ internal static bool IsRooted(string filePath)
filePath.StartsWith(@"../", StringComparison.Ordinal) ||
filePath.StartsWith(@"~/", StringComparison.Ordinal) ||
filePath.StartsWith(@"~\", StringComparison.Ordinal) ||
filePath.IndexOf(":", StringComparison.Ordinal) >= 0);
filePath.Contains(':'));
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/ParameterSetInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ internal static string GetParameterTypeString(Type type, IEnumerable<Attribute>
}

// If the type is really an array, but the typename didn't include [], then add it.
if (type.IsArray && (parameterTypeString.IndexOf("[]", StringComparison.OrdinalIgnoreCase) == -1))
if (type.IsArray && (parameterTypeString.IndexOf("[]", StringComparison.Ordinal) == -1))
{
var t = type;
while (t.IsArray)
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/parser/ast.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8349,7 +8349,7 @@ internal Type GetGenericType(Type generic)
{
if (generic == null || !generic.ContainsGenericParameters)
{
if (TypeName.FullName.IndexOf("`", StringComparison.OrdinalIgnoreCase) == -1)
if (!TypeName.FullName.Contains('`'))
{
var newTypeName = new TypeName(Extent,
string.Format(CultureInfo.InvariantCulture, "{0}`{1}", TypeName.FullName, GenericArguments.Count));
Expand All @@ -8376,7 +8376,7 @@ public Type GetReflectionAttributeType()
Type generic = TypeName.GetReflectionAttributeType();
if (generic == null || !generic.ContainsGenericParameters)
{
if (TypeName.FullName.IndexOf("`", StringComparison.OrdinalIgnoreCase) == -1)
if (!TypeName.FullName.Contains('`'))
{
var newTypeName = new TypeName(Extent,
string.Format(CultureInfo.InvariantCulture, "{0}Attribute`{1}", TypeName.FullName, GenericArguments.Count));
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5436,7 +5436,7 @@ protected override void BeginProcessing()

if (!string.IsNullOrEmpty(this.Username))
{
if (this.Username.IndexOf("\\", StringComparison.OrdinalIgnoreCase) >= 0)
if (this.Username.Contains('\\'))
{
validator = null;

Expand Down
6 changes: 3 additions & 3 deletions src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1285,8 +1285,8 @@ private void UpdateUri(Uri uri)
(RemotingErrorIdStrings.RelativeUriForRunspacePathNotSupported));
}

if (uri.OriginalString.LastIndexOf(":", StringComparison.OrdinalIgnoreCase) >
uri.AbsoluteUri.IndexOf("//", StringComparison.OrdinalIgnoreCase))
if (uri.OriginalString.LastIndexOf(':') >
uri.AbsoluteUri.IndexOf("//", StringComparison.Ordinal))
{
UseDefaultWSManPort = false;
}
Expand All @@ -1296,7 +1296,7 @@ private void UpdateUri(Uri uri)
// http://localhost , http://127.0.0.1 etc.
string appname;

if (uri.AbsolutePath.Equals("/", StringComparison.OrdinalIgnoreCase) &&
if (uri.AbsolutePath.Equals("/", StringComparison.Ordinal) &&
string.IsNullOrEmpty(uri.Query) && string.IsNullOrEmpty(uri.Fragment))
{
appname = s_defaultAppName;
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/help/SaveHelpCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ internal override bool ProcessModuleWithCulture(UpdatableHelpModuleInfo module,
{
// Deal with wildcards

int index = path.IndexOf("*", StringComparison.OrdinalIgnoreCase);
int index = path.IndexOf('*');

if (index == 0)
{
Expand Down
14 changes: 7 additions & 7 deletions src/System.Management.Automation/namespaces/FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5340,13 +5340,13 @@ private string RemoveRelativeTokens(string path)
{
string testPath = path.Replace('/', '\\');
if (
(testPath.IndexOf("\\", StringComparison.OrdinalIgnoreCase) < 0) ||
testPath.StartsWith(".\\", StringComparison.OrdinalIgnoreCase) ||
testPath.StartsWith("..\\", StringComparison.OrdinalIgnoreCase) ||
testPath.EndsWith("\\.", StringComparison.OrdinalIgnoreCase) ||
testPath.EndsWith("\\..", StringComparison.OrdinalIgnoreCase) ||
(testPath.IndexOf("\\.\\", StringComparison.OrdinalIgnoreCase) > 0) ||
(testPath.IndexOf("\\..\\", StringComparison.OrdinalIgnoreCase) > 0))
!testPath.Contains('\\') ||
testPath.StartsWith(".\\", StringComparison.Ordinal) ||
testPath.StartsWith("..\\", StringComparison.Ordinal) ||
testPath.EndsWith("\\.", StringComparison.Ordinal) ||
testPath.EndsWith("\\..", StringComparison.Ordinal) ||
testPath.Contains("\\.\\", StringComparison.Ordinal) ||
testPath.Contains("\\..\\", StringComparison.Ordinal))
{
try
{
Expand Down
8 changes: 4 additions & 4 deletions src/System.Management.Automation/namespaces/LocationGlobber.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1506,7 +1506,7 @@ internal static bool IsAbsolutePath(string path)
break;
}

int index = path.IndexOf(":", StringComparison.Ordinal);
int index = path.IndexOf(':');

if (index == -1)
{
Expand Down Expand Up @@ -1604,7 +1604,7 @@ internal bool IsAbsolutePath(string path, out string driveName)
break;
}

int index = path.IndexOf(":", StringComparison.Ordinal);
int index = path.IndexOf(':');

if (index == -1)
{
Expand Down Expand Up @@ -1863,7 +1863,7 @@ internal string GetDriveRootRelativePathFromPSPath(
string normalizedRoot = _sessionState.Drive.Current.Root.Replace(
StringLiterals.AlternatePathSeparator, StringLiterals.DefaultPathSeparator);

if (normalizedRoot.IndexOf(":", StringComparison.Ordinal) >= 0)
if (normalizedRoot.Contains(':'))
{
string normalizedPath = path.Replace(StringLiterals.AlternatePathSeparator, StringLiterals.DefaultPathSeparator);
if (normalizedPath.StartsWith(normalizedRoot, StringComparison.OrdinalIgnoreCase))
Expand Down Expand Up @@ -3160,7 +3160,7 @@ private static string RemoveDriveQualifier(string path)

// Find the drive separator only if it's before a path separator

int index = path.IndexOf(":", StringComparison.Ordinal);
int index = path.IndexOf(':');
if (index != -1)
{
int separator = path.IndexOf(StringLiterals.DefaultPathSeparator, 0, index);
Expand Down
10 changes: 5 additions & 5 deletions src/System.Management.Automation/namespaces/RegistryProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2958,7 +2958,7 @@ private string NormalizePath(string path)
private bool HasRelativePathTokens(string path)
{
return (
(path.IndexOf("\\", StringComparison.OrdinalIgnoreCase) == 0) ||
path.StartsWith('\\') ||
path.Contains("\\.\\") ||
path.Contains("\\..\\") ||
path.EndsWith("\\..", StringComparison.OrdinalIgnoreCase) ||
Expand Down Expand Up @@ -3332,12 +3332,12 @@ private bool CreateIntermediateKeys(string path)

path = NormalizePath(path);

int index = path.IndexOf("\\", StringComparison.Ordinal);
int index = path.IndexOf('\\');
if (index == 0)
{
// The user may precede a path with \
path = path.Substring(1);
index = path.IndexOf("\\", StringComparison.Ordinal);
index = path.IndexOf('\\');
}

if (index == -1)
Expand Down Expand Up @@ -3522,14 +3522,14 @@ private IRegistryWrapper GetRegkeyForPath(string path, bool writeAccess)

do // false loop
{
int index = path.IndexOf("\\", StringComparison.Ordinal);
int index = path.IndexOf('\\');

if (index == 0)
{
// The user may proceed a path with \

path = path.Substring(1);
index = path.IndexOf("\\", StringComparison.Ordinal);
index = path.IndexOf('\\');
}

if (index == -1)
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/namespaces/TransactedRegistryKey.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2037,15 +2037,15 @@ private static void ValidateKeyName(string name)
throw new ArgumentNullException(RegistryProviderStrings.Arg_Name);
}

int nextSlash = name.IndexOf("\\", StringComparison.OrdinalIgnoreCase);
int nextSlash = name.IndexOf('\\');
int current = 0;
while (nextSlash != -1)
{
if ((nextSlash - current) > MaxKeyLength)
throw new ArgumentException(RegistryProviderStrings.Arg_RegKeyStrLenBug);

current = nextSlash + 1;
nextSlash = name.IndexOf("\\", current, StringComparison.OrdinalIgnoreCase);
nextSlash = name.IndexOf('\\', current);
}

if ((name.Length - current) > MaxKeyLength)
Expand Down