Cleanup: Use EndsWith(char) and StartsWith(char) (PowerShell#9994)

iSazonov · daxian-dbw · commit 74c87ab20b5f · 2019-06-25T11:02:31.000-07:00
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs
@@ -1294,7 +1294,7 @@ private string BuildStructuredQueryFromHashTable(EventLogSession eventLogSession
                     string query = queriedLogsQueryMap[keyLogName];
                     result.Append(query);
 
-                    if (query.EndsWith("*", StringComparison.OrdinalIgnoreCase))
+                    if (query.EndsWith('*'))
                     {
                         //
                         // No provider predicate: just add the XPath string
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ClearRecycleBinCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ClearRecycleBinCommand.cs
@@ -171,7 +171,7 @@ private string GetDrivePath(string driveName)
             {
                 drivePath = driveName;
             }
-            else if (driveName.EndsWith(":", StringComparison.OrdinalIgnoreCase))
+            else if (driveName.EndsWith(':'))
             {
                 drivePath = driveName + "\\";
             }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
@@ -1898,7 +1898,7 @@ internal static bool ContainsSystemDrive(string[] drives, string sysdrive)
             string driveApp;
             foreach (string drive in drives)
             {
-                if (!drive.EndsWith("\\", StringComparison.OrdinalIgnoreCase))
+                if (!drive.EndsWith('\\'))
                 {
                     driveApp = string.Concat(drive, "\\");
                 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ResolvePathCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ResolvePathCommand.cs
@@ -123,7 +123,7 @@ protected override void ProcessRecord()
                             // Do not insert './' if result path is not relative
                             if (!adjustedPath.StartsWith(
                                     currentPath.Drive?.Root ?? currentPath.Path, StringComparison.OrdinalIgnoreCase) &&
-                                !adjustedPath.StartsWith(".", StringComparison.OrdinalIgnoreCase))
+                                !adjustedPath.StartsWith('.'))
                             {
                                 adjustedPath = SessionState.Path.Combine(".", adjustedPath);
                             }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
@@ -1301,7 +1301,7 @@ internal void ReadHeader()
                     values[0] = values[0].Substring(9);
                     Header = values;
                 }
-                else if (values.Count != 0 && values[0].StartsWith("#"))
+                else if (values.Count != 0 && values[0].StartsWith('#'))
                 {
                     // Skip all lines starting with '#'
                 }
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
@@ -1160,7 +1160,7 @@ bool TryGetBoolValue(string arg, out bool boolValue)
 
                 if (!System.IO.File.Exists(_file))
                 {
-                    if (args[i].StartsWith("-") && args[i].Length > 1)
+                    if (args[i].StartsWith('-') && args[i].Length > 1)
                     {
                         string param = args[i].Substring(1, args[i].Length - 1).ToLower();
                         StringBuilder possibleParameters = new StringBuilder();
diff --git a/src/Microsoft.WSMan.Management/ConfigProvider.cs b/src/Microsoft.WSMan.Management/ConfigProvider.cs
@@ -2969,7 +2969,7 @@ private string GetFilterString(Hashtable cmdlinevalues, string[] pkey)
                 }
             }
 
-            if (filter.ToString().EndsWith("+", StringComparison.OrdinalIgnoreCase))
+            if (filter.ToString().EndsWith('+'))
                 filter.Remove(filter.ToString().Length - 1, 1);
             return filter.ToString();
         }
diff --git a/src/Microsoft.WSMan.Management/WsManHelper.cs b/src/Microsoft.WSMan.Management/WsManHelper.cs
@@ -922,7 +922,7 @@ internal string GetURIWithFilter(string uri, string filter, Hashtable selectorse
             if (operation.Equals("remove", StringComparison.OrdinalIgnoreCase))
             {
                 sburi.Append(GetFilterString(selectorset));
-                if (sburi.ToString().EndsWith("?", StringComparison.OrdinalIgnoreCase))
+                if (sburi.ToString().EndsWith('?'))
                 {
                     sburi.Remove(sburi.Length - 1, 1);
                 }
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs b/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs
@@ -887,7 +887,7 @@ internal static List<CompletionResult> PSv2GenerateMatchSetOfFiles(PowerShellExe
 
                 lastWord = lastWord ?? string.Empty;
                 bool isLastWordEmpty = string.IsNullOrEmpty(lastWord);
-                bool lastCharIsStar = !isLastWordEmpty && lastWord.EndsWith("*", StringComparison.Ordinal);
+                bool lastCharIsStar = !isLastWordEmpty && lastWord.EndsWith('*');
                 bool containsGlobChars = WildcardPattern.ContainsWildcardCharacters(lastWord);
 
                 string wildWord = lastWord + "*";
@@ -1045,9 +1045,9 @@ private static bool PSv2ShouldFullyQualifyPathsPath(PowerShellExecutionHelper he
             {
                 // These are special cases, as they represent cases where the user expects to
                 // see the full path.
-                if (lastWord.StartsWith("~", StringComparison.OrdinalIgnoreCase) ||
-                    lastWord.StartsWith("\\", StringComparison.OrdinalIgnoreCase) ||
-                    lastWord.StartsWith("/", StringComparison.OrdinalIgnoreCase))
+                if (lastWord.StartsWith('~') ||
+                    lastWord.StartsWith('\\') ||
+                    lastWord.StartsWith('/'))
                 {
                     return true;
                 }
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -387,7 +387,7 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                         }
 
                         // Handle scenarios like this: dir -path:<tab>
-                        if (completionContext.WordToComplete.EndsWith(":", StringComparison.Ordinal))
+                        if (completionContext.WordToComplete.EndsWith(':'))
                         {
                             replacementIndex = tokenAtCursor.Extent.EndScriptPosition.Offset;
                             replacementLength = 0;
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -427,7 +427,7 @@ internal static List<CompletionResult> CompleteModuleName(CompletionContext cont
             var result = new List<CompletionResult>();
             var quote = HandleDoubleAndSingleQuote(ref moduleName);
 
-            if (!moduleName.EndsWith("*", StringComparison.Ordinal))
+            if (!moduleName.EndsWith('*'))
             {
                 moduleName += "*";
             }
@@ -507,7 +507,7 @@ internal static List<CompletionResult> CompleteCommandParameter(CompletionContex
             // If parent is DynamicKeywordStatementAst - 'Import-DscResource',
             // then customize the auto completion results
             if (keywordAst != null && string.Equals(keywordAst.Keyword.Keyword, "Import-DscResource", StringComparison.OrdinalIgnoreCase)
-                && !string.IsNullOrWhiteSpace(context.WordToComplete) && context.WordToComplete.StartsWith("-", StringComparison.OrdinalIgnoreCase))
+                && !string.IsNullOrWhiteSpace(context.WordToComplete) && context.WordToComplete.StartsWith('-'))
             {
                 var lastAst = context.RelatedAsts.Last();
                 var wordToMatch = context.WordToComplete.Substring(1) + "*";
@@ -536,7 +536,7 @@ internal static List<CompletionResult> CompleteCommandParameter(CompletionContex
                 // Parent must be a command
                 commandAst = (CommandAst)parameterAst.Parent;
                 partialName = parameterAst.ParameterName;
-                withColon = context.WordToComplete.EndsWith(":", StringComparison.Ordinal);
+                withColon = context.WordToComplete.EndsWith(':');
             }
             else
             {
@@ -807,7 +807,7 @@ where pattern.IsMatch(alias)
         /// <returns>A list of completion results.</returns>
         public static List<CompletionResult> CompleteOperator(string wordToComplete)
         {
-            if (wordToComplete.StartsWith("-", StringComparison.Ordinal))
+            if (wordToComplete.StartsWith('-'))
             {
                 wordToComplete = wordToComplete.Substring(1);
             }
@@ -846,7 +846,7 @@ internal static List<CompletionResult> CompleteCommandArgument(CompletionContext
                 {
                     commandAst = (CommandAst)expressionAst.Parent;
 
-                    if (expressionAst is ErrorExpressionAst && expressionAst.Extent.Text.EndsWith(",", StringComparison.Ordinal))
+                    if (expressionAst is ErrorExpressionAst && expressionAst.Extent.Text.EndsWith(','))
                     {
                         context.WordToComplete = string.Empty;
                         // BUGBUG context.CursorPosition = expressionAst.Extent.StartScriptPosition;
@@ -978,7 +978,7 @@ internal static List<CompletionResult> CompleteCommandArgument(CompletionContext
                 else if (expressionAst.Parent is CommandParameterAst && expressionAst.Parent.Parent is CommandAst)
                 {
                     commandAst = (CommandAst)expressionAst.Parent.Parent;
-                    if (expressionAst is ErrorExpressionAst && expressionAst.Extent.Text.EndsWith(",", StringComparison.Ordinal))
+                    if (expressionAst is ErrorExpressionAst && expressionAst.Extent.Text.EndsWith(','))
                     {
                         // dir -Path: a.txt,<tab>
                         context.WordToComplete = string.Empty;
@@ -1228,7 +1228,7 @@ internal static List<CompletionResult> CompleteCommandArgument(CompletionContext
                     secondToLastMemberAst.Extent.EndLineNumber == pathAst.Extent.StartLineNumber &&
                     secondToLastMemberAst.Extent.EndColumnNumber == pathAst.Extent.StartColumnNumber)
                 {
-                    var memberName = pathAst.Value.EndsWith("*", StringComparison.Ordinal)
+                    var memberName = pathAst.Value.EndsWith('*')
                                          ? pathAst.Value
                                          : pathAst.Value + "*";
                     var targetExpr = secondToLastMemberAst.Expression;
@@ -2911,7 +2911,7 @@ private static void NativeCompletionEventLogCommands(CompletionContext context,
                 var logName = context.WordToComplete ?? string.Empty;
                 var quote = HandleDoubleAndSingleQuote(ref logName);
 
-                if (!logName.EndsWith("*", StringComparison.Ordinal))
+                if (!logName.EndsWith('*'))
                 {
                     logName += "*";
                 }
@@ -2962,7 +2962,7 @@ private static void NativeCompletionJobCommands(CompletionContext context, strin
             var wordToComplete = context.WordToComplete ?? string.Empty;
             var quote = HandleDoubleAndSingleQuote(ref wordToComplete);
 
-            if (!wordToComplete.EndsWith("*", StringComparison.Ordinal))
+            if (!wordToComplete.EndsWith('*'))
             {
                 wordToComplete += "*";
             }
@@ -3049,7 +3049,7 @@ private static void NativeCompletionScheduledJobCommands(CompletionContext conte
             var wordToComplete = context.WordToComplete ?? string.Empty;
             var quote = HandleDoubleAndSingleQuote(ref wordToComplete);
 
-            if (!wordToComplete.EndsWith("*", StringComparison.Ordinal))
+            if (!wordToComplete.EndsWith('*'))
             {
                 wordToComplete += "*";
             }
@@ -3183,7 +3183,7 @@ private static void NativeCompletionProcessCommands(CompletionContext context, s
             var wordToComplete = context.WordToComplete ?? string.Empty;
             var quote = HandleDoubleAndSingleQuote(ref wordToComplete);
 
-            if (!wordToComplete.EndsWith("*", StringComparison.Ordinal))
+            if (!wordToComplete.EndsWith('*'))
             {
                 wordToComplete += "*";
             }
@@ -3274,7 +3274,7 @@ private static void NativeCompletionProviderCommands(CompletionContext context,
             var providerName = context.WordToComplete ?? string.Empty;
             var quote = HandleDoubleAndSingleQuote(ref providerName);
 
-            if (!providerName.EndsWith("*", StringComparison.Ordinal))
+            if (!providerName.EndsWith('*'))
             {
                 providerName += "*";
             }
@@ -3318,7 +3318,7 @@ private static void NativeCompletionDriveCommands(CompletionContext context, str
             var wordToComplete = context.WordToComplete ?? string.Empty;
             var quote = HandleDoubleAndSingleQuote(ref wordToComplete);
 
-            if (!wordToComplete.EndsWith("*", StringComparison.Ordinal))
+            if (!wordToComplete.EndsWith('*'))
             {
                 wordToComplete += "*";
             }
@@ -3365,7 +3365,7 @@ private static void NativeCompletionServiceCommands(CompletionContext context, s
             var wordToComplete = context.WordToComplete ?? string.Empty;
             var quote = HandleDoubleAndSingleQuote(ref wordToComplete);
 
-            if (!wordToComplete.EndsWith("*", StringComparison.Ordinal))
+            if (!wordToComplete.EndsWith('*'))
             {
                 wordToComplete += "*";
             }
@@ -3451,7 +3451,7 @@ private static void NativeCompletionVariableCommands(CompletionContext context,
 
             var variableName = context.WordToComplete ?? string.Empty;
             var quote = HandleDoubleAndSingleQuote(ref variableName);
-            if (!variableName.EndsWith("*", StringComparison.Ordinal))
+            if (!variableName.EndsWith('*'))
             {
                 variableName += "*";
             }
@@ -3511,7 +3511,7 @@ private static void NativeCompletionAliasCommands(CompletionContext context, str
                 var commandName = context.WordToComplete ?? string.Empty;
                 var quote = HandleDoubleAndSingleQuote(ref commandName);
 
-                if (!commandName.EndsWith("*", StringComparison.Ordinal))
+                if (!commandName.EndsWith('*'))
                 {
                     commandName += "*";
                 }
@@ -3572,7 +3572,7 @@ private static void NativeCompletionTraceSourceCommands(CompletionContext contex
             var traceSourceName = context.WordToComplete ?? string.Empty;
             var quote = HandleDoubleAndSingleQuote(ref traceSourceName);
 
-            if (!traceSourceName.EndsWith("*", StringComparison.Ordinal))
+            if (!traceSourceName.EndsWith('*'))
             {
                 traceSourceName += "*";
             }
@@ -4008,7 +4008,7 @@ private static ArgumentLocation GenerateArgumentLocation(AstParameterArgumentPai
                     if (!prev.ParameterSpecified)
                         return new ArgumentLocation() { Argument = null, IsPositional = true, Position = position };
 
-                    return prev.Parameter.Extent.Text.EndsWith(":", StringComparison.Ordinal)
+                    return prev.Parameter.Extent.Text.EndsWith(':')
                         ? new ArgumentLocation() { Argument = prev, IsPositional = false, Position = -1 }
 
                         : new ArgumentLocation() { Argument = null, IsPositional = true, Position = position };
@@ -4520,7 +4520,7 @@ internal static List<string> GetFileShares(string machine, bool ignoreHidden)
 
                     if ((shareInfo.type & STYPE_MASK) != STYPE_DISKTREE)
                         continue;
-                    if (ignoreHidden && shareInfo.netname.EndsWith("$", StringComparison.Ordinal))
+                    if (ignoreHidden && shareInfo.netname.EndsWith('$'))
                         continue;
                     shares.Add(shareInfo.netname);
                 }
@@ -6122,7 +6122,7 @@ internal static List<CompletionResult> CompleteStatementFlags(TokenKind kind, st
 
                     Diagnostics.Assert(!string.IsNullOrEmpty(wordToComplete) && wordToComplete[0].IsDash(), "the word to complete should start with '-'");
                     wordToComplete = wordToComplete.Substring(1);
-                    bool withColon = wordToComplete.EndsWith(":", StringComparison.Ordinal);
+                    bool withColon = wordToComplete.EndsWith(':');
                     wordToComplete = withColon ? wordToComplete.Remove(wordToComplete.Length - 1) : wordToComplete;
 
                     string enumString = LanguagePrimitives.EnumSingleTypeConverter.EnumValues(typeof(SwitchFlags));
diff --git a/src/System.Management.Automation/engine/CommandDiscovery.cs b/src/System.Management.Automation/engine/CommandDiscovery.cs
@@ -1182,7 +1182,7 @@ private static CommandInfo TryModuleAutoLoading(string commandName, ExecutionCon
                 }
             }
 
-            if (string.IsNullOrEmpty(moduleName) || string.IsNullOrEmpty(moduleCommandName) || moduleName.EndsWith(".", StringComparison.Ordinal))
+            if (string.IsNullOrEmpty(moduleName) || string.IsNullOrEmpty(moduleCommandName) || moduleName.EndsWith('.'))
                 return null;
 
             bool etwEnabled = CommandDiscoveryEventSource.Log.IsEnabled();
@@ -1668,7 +1668,7 @@ internal Collection<int> IndexOfRelativePath()
             {
                 string path = this[index];
                 if (!string.IsNullOrEmpty(path) &&
-                    path.StartsWith(".", StringComparison.Ordinal))
+                    path.StartsWith('.'))
                 {
                     result.Add(index);
                 }
diff --git a/src/System.Management.Automation/engine/CommandInfo.cs b/src/System.Management.Automation/engine/CommandInfo.cs
@@ -871,8 +871,8 @@ public Type Type
                     {
                         // We ignore the exception.
                         if (Name != null &&
-                            Name.StartsWith("[", StringComparison.OrdinalIgnoreCase) &&
-                            Name.EndsWith("]", StringComparison.OrdinalIgnoreCase))
+                            Name.StartsWith('[') &&
+                            Name.EndsWith(']'))
                         {
                             string tmp = Name.Substring(1, Name.Length - 2);
                             TypeResolver.TryResolveType(tmp, out _type);
diff --git a/src/System.Management.Automation/engine/CommonCommandParameters.cs b/src/System.Management.Automation/engine/CommonCommandParameters.cs
@@ -237,7 +237,7 @@ protected override void Validate(object arguments, EngineIntrinsics engineIntrin
                 string varName = arguments as string;
                 if (varName != null)
                 {
-                    if (varName.StartsWith("+", StringComparison.Ordinal))
+                    if (varName.StartsWith('+'))
                     {
                         varName = varName.Substring(1);
                     }
diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -906,7 +906,7 @@ internal void SetupOutVariable()
             // as it needs to handle much of its OutVariable support itself.
             if (
                 (!string.IsNullOrEmpty(this.OutVariable)) &&
-                (!(this.OutVariable.StartsWith("+", StringComparison.Ordinal))) &&
+                (!(this.OutVariable.StartsWith('+'))) &&
                 string.Equals("Out-Default", _thisCommand.CommandInfo.Name, StringComparison.OrdinalIgnoreCase))
             {
                 if (_state == null)
@@ -2492,7 +2492,7 @@ internal void SetupVariable(VariableStreamKind streamKind, string variableName,
             if (_state == null)
                 _state = new SessionState(Context.EngineSessionState);
 
-            if (variableName.StartsWith("+", StringComparison.Ordinal))
+            if (variableName.StartsWith('+'))
             {
                 variableName = variableName.Substring(1);
                 object oldValue = PSObject.Base(_state.PSVariable.GetValue(variableName));
diff --git a/src/System.Management.Automation/help/UpdatableHelpSystem.cs b/src/System.Management.Automation/help/UpdatableHelpSystem.cs
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
diff --git a/src/System.Management.Automation/namespaces/LocationGlobber.cs b/src/System.Management.Automation/namespaces/LocationGlobber.cs
diff --git a/src/System.Management.Automation/namespaces/RegistryProvider.cs b/src/System.Management.Automation/namespaces/RegistryProvider.cs
diff --git a/src/System.Management.Automation/utils/PathUtils.cs b/src/System.Management.Automation/utils/PathUtils.cs

Original file line number	Diff line number	Diff line change
`@@ -1294,7 +1294,7 @@ private string BuildStructuredQueryFromHashTable(EventLogSession eventLogSession`
`1294`	`1294`	`string query = queriedLogsQueryMap[keyLogName];`
`1295`	`1295`	`result.Append(query);`
`1296`	`1296`
`1297`		`- if (query.EndsWith("*", StringComparison.OrdinalIgnoreCase))`
	`1297`	`+ if (query.EndsWith('*'))`
`1298`	`1298`	`{`
`1299`	`1299`	`//`
`1300`	`1300`	`// No provider predicate: just add the XPath string`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ private string GetDrivePath(string driveName)`
`171`	`171`	`{`
`172`	`172`	`drivePath = driveName;`
`173`	`173`	`}`
`174`		`- else if (driveName.EndsWith(":", StringComparison.OrdinalIgnoreCase))`
	`174`	`+ else if (driveName.EndsWith(':'))`
`175`	`175`	`{`
`176`	`176`	`drivePath = driveName + "\\";`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1898,7 +1898,7 @@ internal static bool ContainsSystemDrive(string[] drives, string sysdrive)`
`1898`	`1898`	`string driveApp;`
`1899`	`1899`	`foreach (string drive in drives)`
`1900`	`1900`	`{`
`1901`		`- if (!drive.EndsWith("\\", StringComparison.OrdinalIgnoreCase))`
	`1901`	`+ if (!drive.EndsWith('\\'))`
`1902`	`1902`	`{`
`1903`	`1903`	`driveApp = string.Concat(drive, "\\");`
`1904`	`1904`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ protected override void ProcessRecord()`
`123`	`123`	`// Do not insert './' if result path is not relative`
`124`	`124`	`if (!adjustedPath.StartsWith(`
`125`	`125`	`currentPath.Drive?.Root ?? currentPath.Path, StringComparison.OrdinalIgnoreCase) &&`
`126`		`- !adjustedPath.StartsWith(".", StringComparison.OrdinalIgnoreCase))`
	`126`	`+ !adjustedPath.StartsWith('.'))`
`127`	`127`	`{`
`128`	`128`	`adjustedPath = SessionState.Path.Combine(".", adjustedPath);`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1301,7 +1301,7 @@ internal void ReadHeader()`
`1301`	`1301`	`values[0] = values[0].Substring(9);`
`1302`	`1302`	`Header = values;`
`1303`	`1303`	`}`
`1304`		`- else if (values.Count != 0 && values[0].StartsWith("#"))`
	`1304`	`+ else if (values.Count != 0 && values[0].StartsWith('#'))`
`1305`	`1305`	`{`
`1306`	`1306`	`// Skip all lines starting with '#'`
`1307`	`1307`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1160,7 +1160,7 @@ bool TryGetBoolValue(string arg, out bool boolValue)`
`1160`	`1160`
`1161`	`1161`	`if (!System.IO.File.Exists(_file))`
`1162`	`1162`	`{`
`1163`		`- if (args[i].StartsWith("-") && args[i].Length > 1)`
	`1163`	`+ if (args[i].StartsWith('-') && args[i].Length > 1)`
`1164`	`1164`	`{`
`1165`	`1165`	`string param = args[i].Substring(1, args[i].Length - 1).ToLower();`
`1166`	`1166`	`StringBuilder possibleParameters = new StringBuilder();`
Original file line number	Diff line number	Diff line change
`@@ -2969,7 +2969,7 @@ private string GetFilterString(Hashtable cmdlinevalues, string[] pkey)`
`2969`	`2969`	`}`
`2970`	`2970`	`}`
`2971`	`2971`
`2972`		`- if (filter.ToString().EndsWith("+", StringComparison.OrdinalIgnoreCase))`
	`2972`	`+ if (filter.ToString().EndsWith('+'))`
`2973`	`2973`	`filter.Remove(filter.ToString().Length - 1, 1);`
`2974`	`2974`	`return filter.ToString();`
`2975`	`2975`	`}`
Original file line number	Diff line number	Diff line change
`@@ -922,7 +922,7 @@ internal string GetURIWithFilter(string uri, string filter, Hashtable selectorse`
`922`	`922`	`if (operation.Equals("remove", StringComparison.OrdinalIgnoreCase))`
`923`	`923`	`{`
`924`	`924`	`sburi.Append(GetFilterString(selectorset));`
`925`		`- if (sburi.ToString().EndsWith("?", StringComparison.OrdinalIgnoreCase))`
	`925`	`+ if (sburi.ToString().EndsWith('?'))`
`926`	`926`	`{`
`927`	`927`	`sburi.Remove(sburi.Length - 1, 1);`
`928`	`928`	`}`
Original file line number	Diff line number	Diff line change
`@@ -887,7 +887,7 @@ internal static List<CompletionResult> PSv2GenerateMatchSetOfFiles(PowerShellExe`
`887`	`887`
`888`	`888`	`lastWord = lastWord ?? string.Empty;`
`889`	`889`	`bool isLastWordEmpty = string.IsNullOrEmpty(lastWord);`
`890`		`- bool lastCharIsStar = !isLastWordEmpty && lastWord.EndsWith("*", StringComparison.Ordinal);`
	`890`	`+ bool lastCharIsStar = !isLastWordEmpty && lastWord.EndsWith('*');`
`891`	`891`	`bool containsGlobChars = WildcardPattern.ContainsWildcardCharacters(lastWord);`
`892`	`892`
`893`	`893`	`string wildWord = lastWord + "*";`
`@@ -1045,9 +1045,9 @@ private static bool PSv2ShouldFullyQualifyPathsPath(PowerShellExecutionHelper he`
`1045`	`1045`	`{`
`1046`	`1046`	`// These are special cases, as they represent cases where the user expects to`
`1047`	`1047`	`// see the full path.`
`1048`		`- if (lastWord.StartsWith("~", StringComparison.OrdinalIgnoreCase) \|\|`
`1049`		`- lastWord.StartsWith("\\", StringComparison.OrdinalIgnoreCase) \|\|`
`1050`		`- lastWord.StartsWith("/", StringComparison.OrdinalIgnoreCase))`
	`1048`	`+ if (lastWord.StartsWith('~') \|\|`
	`1049`	`+ lastWord.StartsWith('\\') \|\|`
	`1050`	`+ lastWord.StartsWith('/'))`
`1051`	`1051`	`{`
`1052`	`1052`	`return true;`
`1053`	`1053`	`}`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont`
`387`	`387`	`}`
`388`	`388`
`389`	`389`	`// Handle scenarios like this: dir -path:<tab>`
`390`		`- if (completionContext.WordToComplete.EndsWith(":", StringComparison.Ordinal))`
	`390`	`+ if (completionContext.WordToComplete.EndsWith(':'))`
`391`	`391`	`{`
`392`	`392`	`replacementIndex = tokenAtCursor.Extent.EndScriptPosition.Offset;`
`393`	`393`	`replacementLength = 0;`