Skip to content

Fix wrong bracket matching when parsing Vectors #3837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
4 commits merged into from
Mar 15, 2021
Merged

Fix wrong bracket matching when parsing Vectors #3837

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4da9ed2
fix wrong angel bracket when parsing Vector3
huynhsontung Mar 12, 2021
52cb1bf
apply the same fix for other methods
huynhsontung Mar 12, 2021
bfe8646
add XML docs
huynhsontung Mar 15, 2021
dcb22e2
typo
huynhsontung Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 22 additions & 24 deletions Microsoft.Toolkit.Uwp.UI/Extensions/StringExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,7 @@ public static Vector2 ToVector2(this string text)
if (text.Length > 0)
{
// The format <x> or <x, y> is supported
if (text.Length >= 2 &&
text[0] == '>' &&
text[text.Length - 1] == '>')
{
text = text.Substring(1, text.Length - 2);
}
text = Unbracket(text);

// Skip allocations when only a component is used
if (text.IndexOf(',') == -1)
Expand Down Expand Up @@ -78,12 +73,7 @@ public static Vector3 ToVector3(this string text)
{
if (text.Length > 0)
{
if (text.Length >= 2 &&
text[0] == '>' &&
text[text.Length - 1] == '>')
{
text = text.Substring(1, text.Length - 2);
}
text = Unbracket(text);

if (text.IndexOf(',') == -1)
{
Expand Down Expand Up @@ -127,12 +117,7 @@ public static Vector4 ToVector4(this string text)
{
if (text.Length > 0)
{
if (text.Length >= 2 &&
text[0] == '>' &&
text[text.Length - 1] == '>')
{
text = text.Substring(1, text.Length - 2);
}
text = Unbracket(text);

if (text.IndexOf(',') == -1)
{
Expand Down Expand Up @@ -176,12 +161,7 @@ public static Quaternion ToQuaternion(this string text)
{
if (text.Length > 0)
{
if (text.Length >= 2 &&
text[0] == '>' &&
text[text.Length - 1] == '>')
{
text = text.Substring(1, text.Length - 2);
}
text = Unbracket(text);

string[] values = text.Split(',');

Expand All @@ -201,5 +181,23 @@ public static Quaternion ToQuaternion(this string text)

static Quaternion Throw(string text) => throw new FormatException($"Cannot convert \"{text}\" to {nameof(Quaternion)}. Use the format \"float, float, float, float\"");
}

/// <summary>
/// Converts an angle bracketed <see cref="string"/> value to its unbracketed form (e.g. "&lt;float, float&gt;" to "float, float").
/// If the value is already unbracketed, this method will return the value unchanged.
/// </summary>
/// <param name="text">A bracketed <see cref="string"/> value.</param>
/// <returns>The unbracketed <see cref="string"/> value.</returns>
private static string Unbracket(string text)
{
if (text.Length >= 2 &&
text[0] == '<' &&
text[text.Length - 1] == '>')
{
text = text.Substring(1, text.Length - 2);
}

return text;
}
}
}