godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Fix string Find methods having reversed case sensitivity

Browse Source
This commit is contained in:
Aaron Franke
2019-12-12 01:18:44 -05:00
parent 37d164e24e
commit d09193b08a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/mono/glue/Managed/Files/StringExtensions.cs
View File

@@ -18,7 +18,7 @@ namespace Godot
int pos = 0; int pos = 0;
int slices = 1; int slices = 1;
while ((pos = instance.Find(splitter, pos)) >= 0) while ((pos = instance.Find(splitter, true, pos)) >= 0)
{ {
slices++; slices++;
pos += splitter.Length; pos += splitter.Length;
@@ -325,17 +325,17 @@ namespace Godot
// <summary> // <summary>
// Find the first occurrence of a substring, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed. // Find the first occurrence of a substring, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed.
// </summary> // </summary>
public static int Find(this string instance, string what, int from = 0) public static int Find(this string instance, string what, bool caseSensitive = true, int from = 0)
{ {
return instance.IndexOf(what, StringComparison.OrdinalIgnoreCase); return instance.IndexOf(what, from, caseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase);
} }
// <summary> // <summary>
// Find the last occurrence of a substring, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed. // Find the last occurrence of a substring, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed.
// </summary> // </summary>
public static int FindLast(this string instance, string what) public static int FindLast(this string instance, string what, bool caseSensitive = true, int from = 0)
{ {
return instance.LastIndexOf(what, StringComparison.OrdinalIgnoreCase); return instance.LastIndexOf(what, from, caseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase);
} }
// <summary> // <summary>
@@ -343,7 +343,7 @@ namespace Godot
// </summary> // </summary>
public static int FindN(this string instance, string what, int from = 0) public static int FindN(this string instance, string what, int from = 0)
{ {
return instance.IndexOf(what, StringComparison.Ordinal); return instance.IndexOf(what, from, StringComparison.OrdinalIgnoreCase);
} }
// <summary> // <summary>
@@ -928,7 +928,7 @@ namespace Godot
while (true) while (true)
{ {
int end = instance.Find(divisor, from); int end = instance.Find(divisor, true, from);
if (end < 0) if (end < 0)
end = len; end = len;
if (allowEmpty || end > from) if (allowEmpty || end > from)