|
@@ -314,7 +314,7 @@ namespace Godot
|
|
|
/// <returns>The capitalized string.</returns>
|
|
|
public static string Capitalize(this string instance)
|
|
|
{
|
|
|
- string aux = instance.CamelcaseToUnderscore(true).Replace("_", " ").Trim();
|
|
|
+ string aux = instance.CamelcaseToUnderscore(true).Replace("_", " ", StringComparison.Ordinal).Trim();
|
|
|
string cap = string.Empty;
|
|
|
|
|
|
for (int i = 0; i < aux.GetSliceCount(" "); i++)
|
|
@@ -742,7 +742,7 @@ namespace Godot
|
|
|
byte[] ret = new byte[len];
|
|
|
for (int i = 0; i < len; i++)
|
|
|
{
|
|
|
- ret[i] = (byte)int.Parse(instance.AsSpan(i * 2, 2), NumberStyles.AllowHexSpecifier);
|
|
|
+ ret[i] = (byte)int.Parse(instance.AsSpan(i * 2, 2), NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture);
|
|
|
}
|
|
|
return ret;
|
|
|
}
|
|
@@ -821,7 +821,7 @@ namespace Godot
|
|
|
instance = instance.Substring(2);
|
|
|
}
|
|
|
|
|
|
- return sign * int.Parse(instance, NumberStyles.HexNumber);
|
|
|
+ return sign * int.Parse(instance, NumberStyles.HexNumber, CultureInfo.InvariantCulture);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -878,7 +878,7 @@ namespace Godot
|
|
|
if (string.IsNullOrEmpty(instance))
|
|
|
return false;
|
|
|
else if (instance.Length > 1)
|
|
|
- return instance[0] == '/' || instance[0] == '\\' || instance.Contains(":/") || instance.Contains(":\\");
|
|
|
+ return instance[0] == '/' || instance[0] == '\\' || instance.Contains(":/", StringComparison.Ordinal) || instance.Contains(":\\", StringComparison.Ordinal);
|
|
|
else
|
|
|
return instance[0] == '/' || instance[0] == '\\';
|
|
|
}
|
|
@@ -1120,7 +1120,7 @@ namespace Godot
|
|
|
/// <returns>If the string contains a valid IP address.</returns>
|
|
|
public static bool IsValidIPAddress(this string instance)
|
|
|
{
|
|
|
- if (instance.Contains(':'))
|
|
|
+ if (instance.Contains(':', StringComparison.Ordinal))
|
|
|
{
|
|
|
string[] ip = instance.Split(':');
|
|
|
|
|
@@ -1404,23 +1404,10 @@ namespace Godot
|
|
|
return instance + "/" + file;
|
|
|
}
|
|
|
|
|
|
- /// <summary>
|
|
|
- /// Replace occurrences of a substring for different ones inside the string.
|
|
|
- /// </summary>
|
|
|
- /// <seealso cref="ReplaceN(string, string, string)"/>
|
|
|
- /// <param name="instance">The string to modify.</param>
|
|
|
- /// <param name="what">The substring to be replaced in the string.</param>
|
|
|
- /// <param name="forwhat">The substring that replaces <paramref name="what"/>.</param>
|
|
|
- /// <returns>The string with the substring occurrences replaced.</returns>
|
|
|
- public static string Replace(this string instance, string what, string forwhat)
|
|
|
- {
|
|
|
- return instance.Replace(what, forwhat);
|
|
|
- }
|
|
|
-
|
|
|
/// <summary>
|
|
|
/// Replace occurrences of a substring for different ones inside the string, but search case-insensitive.
|
|
|
/// </summary>
|
|
|
- /// <seealso cref="Replace(string, string, string)"/>
|
|
|
+ /// <seealso cref="string.Replace(string, string, StringComparison)"/>
|
|
|
/// <param name="instance">The string to modify.</param>
|
|
|
/// <param name="what">The substring to be replaced in the string.</param>
|
|
|
/// <param name="forwhat">The substring that replaces <paramref name="what"/>.</param>
|
|
@@ -1634,7 +1621,7 @@ namespace Godot
|
|
|
if (end < 0)
|
|
|
end = len;
|
|
|
if (allowEmpty || end > from)
|
|
|
- ret.Add(float.Parse(instance.Substring(from)));
|
|
|
+ ret.Add(float.Parse(instance.Substring(from), CultureInfo.InvariantCulture));
|
|
|
if (end == len)
|
|
|
break;
|
|
|
|
|
@@ -1738,7 +1725,7 @@ namespace Godot
|
|
|
/// <returns>The number representation of the string.</returns>
|
|
|
public static float ToFloat(this string instance)
|
|
|
{
|
|
|
- return float.Parse(instance);
|
|
|
+ return float.Parse(instance, CultureInfo.InvariantCulture);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -1749,7 +1736,7 @@ namespace Godot
|
|
|
/// <returns>The number representation of the string.</returns>
|
|
|
public static int ToInt(this string instance)
|
|
|
{
|
|
|
- return int.Parse(instance);
|
|
|
+ return int.Parse(instance, CultureInfo.InvariantCulture);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -1802,7 +1789,7 @@ namespace Godot
|
|
|
/// <returns>A copy of the string with the prefix string removed from the start.</returns>
|
|
|
public static string TrimPrefix(this string instance, string prefix)
|
|
|
{
|
|
|
- if (instance.StartsWith(prefix))
|
|
|
+ if (instance.StartsWith(prefix, StringComparison.Ordinal))
|
|
|
return instance.Substring(prefix.Length);
|
|
|
|
|
|
return instance;
|
|
@@ -1816,7 +1803,7 @@ namespace Godot
|
|
|
/// <returns>A copy of the string with the suffix string removed from the end.</returns>
|
|
|
public static string TrimSuffix(this string instance, string suffix)
|
|
|
{
|
|
|
- if (instance.EndsWith(suffix))
|
|
|
+ if (instance.EndsWith(suffix, StringComparison.Ordinal))
|
|
|
return instance.Substring(0, instance.Length - suffix.Length);
|
|
|
|
|
|
return instance;
|
|
@@ -1833,7 +1820,7 @@ namespace Godot
|
|
|
/// <returns>The unescaped string.</returns>
|
|
|
public static string URIDecode(this string instance)
|
|
|
{
|
|
|
- return Uri.UnescapeDataString(instance.Replace("+", "%20"));
|
|
|
+ return Uri.UnescapeDataString(instance.Replace("+", "%20", StringComparison.Ordinal));
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -1860,10 +1847,10 @@ namespace Godot
|
|
|
/// <returns>The string sanitized as a valid node name.</returns>
|
|
|
public static string ValidateNodeName(this string instance)
|
|
|
{
|
|
|
- string name = instance.Replace(_invalidNodeNameCharacters[0], "");
|
|
|
+ string name = instance.Replace(_invalidNodeNameCharacters[0], "", StringComparison.Ordinal);
|
|
|
for (int i = 1; i < _invalidNodeNameCharacters.Length; i++)
|
|
|
{
|
|
|
- name = name.Replace(_invalidNodeNameCharacters[i], "");
|
|
|
+ name = name.Replace(_invalidNodeNameCharacters[i], "", StringComparison.Ordinal);
|
|
|
}
|
|
|
return name;
|
|
|
}
|