Use OrdinalIgnoreCase in CommandLineParser (#14303)

iSazonov · web-flow · commit 03f40a00782e · 2020-12-03T14:34:00.000-08:00
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
@@ -602,7 +602,7 @@ internal static string GetConfigurationNameFromGroupPolicy()
         /// </returns>
         private (string switchKey, bool shouldBreak) GetSwitchKey(string[] args, ref int argIndex, ref bool noexitSeen)
         {
-            string switchKey = args[argIndex].Trim().ToLowerInvariant();
+            string switchKey = args[argIndex].Trim();
             if (string.IsNullOrEmpty(switchKey))
             {
                 return (switchKey: string.Empty, shouldBreak: false);
@@ -648,7 +648,7 @@ private static bool MatchSwitch(string switchKey, string match, string smallestU
             Dbg.Assert(match.Contains(smallestUnambiguousMatch), "sUM should be a substring of match");
 
             return (switchKey.Length >= smallestUnambiguousMatch.Length
-                    && match.IndexOf(switchKey, StringComparison.Ordinal) == 0);
+                    && match.StartsWith(switchKey, StringComparison.OrdinalIgnoreCase));
         }
 
         #endregion
@@ -1131,11 +1131,11 @@ static object ConvertToBoolIfPossible(string arg)
                 {
                     if (args[i].StartsWith('-') && args[i].Length > 1)
                     {
-                        string param = args[i].Substring(1, args[i].Length - 1).ToLower();
+                        string param = args[i].Substring(1, args[i].Length - 1);
                         StringBuilder possibleParameters = new StringBuilder();
                         foreach (string validParameter in s_validParameters)
                         {
-                            if (validParameter.Contains(param))
+                            if (validParameter.Contains(param, StringComparison.OrdinalIgnoreCase))
                             {
                                 possibleParameters.Append("\n  -");
                                 possibleParameters.Append(validParameter);

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ internal static string GetConfigurationNameFromGroupPolicy()`
`602`	`602`	`/// </returns>`
`603`	`603`	`private (string switchKey, bool shouldBreak) GetSwitchKey(string[] args, ref int argIndex, ref bool noexitSeen)`
`604`	`604`	`{`
`605`		`- string switchKey = args[argIndex].Trim().ToLowerInvariant();`
	`605`	`+ string switchKey = args[argIndex].Trim();`
`606`	`606`	`if (string.IsNullOrEmpty(switchKey))`
`607`	`607`	`{`
`608`	`608`	`return (switchKey: string.Empty, shouldBreak: false);`
`@@ -648,7 +648,7 @@ private static bool MatchSwitch(string switchKey, string match, string smallestU`
`648`	`648`	`Dbg.Assert(match.Contains(smallestUnambiguousMatch), "sUM should be a substring of match");`
`649`	`649`
`650`	`650`	`return (switchKey.Length >= smallestUnambiguousMatch.Length`
`651`		`- && match.IndexOf(switchKey, StringComparison.Ordinal) == 0);`
	`651`	`+ && match.StartsWith(switchKey, StringComparison.OrdinalIgnoreCase));`
`652`	`652`	`}`
`653`	`653`
`654`	`654`	`#endregion`
`@@ -1131,11 +1131,11 @@ static object ConvertToBoolIfPossible(string arg)`
`1131`	`1131`	`{`
`1132`	`1132`	`if (args[i].StartsWith('-') && args[i].Length > 1)`
`1133`	`1133`	`{`
`1134`		`- string param = args[i].Substring(1, args[i].Length - 1).ToLower();`
	`1134`	`+ string param = args[i].Substring(1, args[i].Length - 1);`
`1135`	`1135`	`StringBuilder possibleParameters = new StringBuilder();`
`1136`	`1136`	`foreach (string validParameter in s_validParameters)`
`1137`	`1137`	`{`
`1138`		`- if (validParameter.Contains(param))`
	`1138`	`+ if (validParameter.Contains(param, StringComparison.OrdinalIgnoreCase))`
`1139`	`1139`	`{`
`1140`	`1140`	`possibleParameters.Append("\n -");`
`1141`	`1141`	`possibleParameters.Append(validParameter);`