Merge pull request #91763 from paulloz/dotnet/fix-stringextension-warnings

C#: Fix comparison warnings in `StringExtensions.cs`
This commit is contained in:
Rémi Verschelde 2024-05-10 09:56:12 +02:00
commit d24403d056
No known key found for this signature in database
GPG Key ID: C3336907360768E1

View File

@ -426,7 +426,9 @@ namespace Godot
/// <returns>An integer that indicates the lexical relationship between the two comparands.</returns> /// <returns>An integer that indicates the lexical relationship between the two comparands.</returns>
public static int CasecmpTo(this string instance, string to) public static int CasecmpTo(this string instance, string to)
{ {
return instance.CompareTo(to, caseSensitive: true); #pragma warning disable CA1309 // Use ordinal string comparison
return string.Compare(instance, to, ignoreCase: false, null);
#pragma warning restore CA1309
} }
/// <summary> /// <summary>
@ -441,7 +443,9 @@ namespace Godot
[Obsolete("Use string.Compare instead.")] [Obsolete("Use string.Compare instead.")]
public static int CompareTo(this string instance, string to, bool caseSensitive = true) public static int CompareTo(this string instance, string to, bool caseSensitive = true)
{ {
return string.Compare(instance, to, !caseSensitive); #pragma warning disable CA1309 // Use ordinal string comparison
return string.Compare(instance, to, ignoreCase: !caseSensitive, null);
#pragma warning restore CA1309
} }
/// <summary> /// <summary>
@ -1261,7 +1265,9 @@ namespace Godot
/// <returns>An integer that indicates the lexical relationship between the two comparands.</returns> /// <returns>An integer that indicates the lexical relationship between the two comparands.</returns>
public static int NocasecmpTo(this string instance, string to) public static int NocasecmpTo(this string instance, string to)
{ {
return instance.CompareTo(to, caseSensitive: false); #pragma warning disable CA1309 // Use ordinal string comparison
return string.Compare(instance, to, ignoreCase: true, null);
#pragma warning restore CA1309
} }
/// <summary> /// <summary>