Skip to content
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

Jump to bottom

[GB18030] Fix SubstringByTextElements - avoid ArgumentOutOfRangeException #10080

Merged
merged 6 commits into from
Apr 30, 2024
Merged

[GB18030] Fix SubstringByTextElements - avoid ArgumentOutOfRangeException #10080

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c9d055
Fix out of range exception.
ilonatommy Apr 29, 2024
8b1b98e
Update src/Build/Evaluation/IntrinsicFunctions.cs
ilonatommy Apr 29, 2024
26bcf7e
Behavior depends on .net version by design.
ilonatommy Apr 29, 2024
e35d141
Test per-framework solution.
ilonatommy Apr 29, 2024
27d07f6
Simplification
ilonatommy Apr 30, 2024
5bf3470
Feedback
ilonatommy Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/Build.UnitTests/Evaluation/Expander_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4385,6 +4385,14 @@ public void PropertyFunctionCheckFeatureAvailability(string featureName, string
[Theory]
[InlineData("\u3407\ud840\udc60\ud86a\ude30\ud86e\udc0a\ud86e\udda0\ud879\udeae\u2fd5\u0023", 0, 3, "\u3407\ud840\udc60\ud86a\ude30")]
[InlineData("\u3407\ud840\udc60\ud86a\ude30\ud86e\udc0a\ud86e\udda0\ud879\udeae\u2fd5\u0023", 2, 5, "\ud86a\ude30\ud86e\udc0a\ud86e\udda0\ud879\udeae\u2fd5")]
// in net742 parts of one emoji are treated as separate graphemes (text elements) while for newer .net they are one grapheme, see doc with change log:
// https://learn.microsoft.com/en-us/dotnet/core/compatibility/globalization/5.0/uax29-compliant-grapheme-enumeration?WT.mc_id=DOP-MVP-5002735#change-description
#if NET5_0_OR_GREATER
ilonatommy marked this conversation as resolved.
Show resolved Hide resolved
[InlineData("\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66\u002e\u0070\u0072\u006f\u006a", 0, 8, "\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66\u002e\u0070\u0072\u006f\u006a")]
#else
[InlineData("\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66\u002e\u0070\u0072\u006f\u006a", 0, 8, "\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66\ud83d\udc68")]
#endif

public void SubstringByTextElements(string featureName, int start, int length, string expected)
{
var expander = new Expander<ProjectPropertyInstance, ProjectItemInstance>(new PropertyDictionary<ProjectPropertyInstance>(), FileSystems.Default);
Expand Down
6 changes: 5 additions & 1 deletion src/Build/Evaluation/IntrinsicFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,11 @@ internal static bool AreFeaturesEnabled(Version wave)
internal static string SubstringByTextElements(string input, int start, int length)
{
StringInfo stringInfo = new StringInfo(input);
return stringInfo.SubstringByTextElements(start, length);
if (stringInfo.LengthInTextElements > length + start)
{
return stringInfo.SubstringByTextElements(start, length);
}
return input;
}

internal static string CheckFeatureAvailability(string featureName)
Expand Down