[iOS][globalization] Fix IndexOf on empty strings on iOS to return -1 by matouskozak · Pull Request #111898 · dotnet/runtime

matouskozak · 2025-01-28T12:39:35Z

Fix incorrect return condition and add test case for IndexOf("", <something>) and "".Contains(<something>).

Clean-up of some styling issues and adding comments.

This PR should fix:

and needs to be backported to .NET 9

dotnet-policy-service · 2025-01-28T12:40:03Z

Tagging subscribers to this area: @dotnet/area-system-globalization
See info in area-owners.md if you want to be subscribed.

matouskozak · 2025-01-28T12:56:35Z

/azp run runtime-ioslike,runtime-ioslikesimulator,runtime-maccatalyst

azure-pipelines · 2025-01-28T12:56:54Z

Azure Pipelines successfully started running 2 pipeline(s).

matouskozak · 2025-01-28T13:43:45Z

/azp run runtime-ioslike

azure-pipelines · 2025-01-28T13:43:52Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

tarekgh · 2025-01-28T18:14:00Z

src/native/libs/System.Globalization.Native/pal_collation.m

 }

+/**
+ * Removes zero-width and other weightless characters such as U+200B (Zero Width Space), 


Removes zero-width and other weightless characters such as U+200B (Zero Width Space),

just in case if this need to change later, it will be good to look at the full list of ignorable characters https://www.unicode.org/charts/collation/chart_Ignored.html

matouskozak · 2025-01-29T17:30:07Z

/azp run runtime-extra-platforms

azure-pipelines · 2025-01-29T17:30:31Z

Azure Pipelines successfully started running 1 pipeline(s).

vitek-karas

Looks reasonable - but I don't understand the code that well.

matouskozak · 2025-01-30T17:02:02Z

/backport to release/9.0-staging

github-actions · 2025-01-30T17:02:15Z

Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/13057341292

github-actions · 2025-01-30T17:03:58Z

@matouskozak backporting to "release/9.0-staging" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Fix IndexOf on empty strings on iOS to return -1
.git/rebase-apply/patch:80: trailing whitespace.
 * Removes zero-width and other weightless characters such as U+200B (Zero Width Space), 
.git/rebase-apply/patch:81: trailing whitespace.
 * U+200C (Zero Width Non-Joiner), U+200D (Zero Width Joiner), U+FEFF (Zero Width No-Break Space), 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.IndexOf.cs
M	src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Runtime/tests/System.Runtime.Tests/System/StringTests.cs
Auto-merging src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.IndexOf.cs
CONFLICT (content): Merge conflict in src/libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.IndexOf.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix IndexOf on empty strings on iOS to return -1
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

* main: (31 commits) More native AOT Pri-1 test tree bring up (dotnet#111994) Fix BigInteger outerloop test (dotnet#111841) JIT: Run 3-opt once across all regions (dotnet#111989) JIT: Check for profile consistency throughout JIT backend (dotnet#111684) [JIT] Add legacy extended EVEX encoding and EVEX.ND/NF feature to x64 emitter backend (dotnet#108796) [iOS][globalization] Fix IndexOf on empty strings on iOS to return -1 (dotnet#111898) System.Speech: Use intellisense xml from dotnet-api-docs (dotnet#111983) [mono][mini] Disable inlining if we encounter class initialization failure (dotnet#111754) [main] Update dependencies from dotnet/roslyn (dotnet#111946) Update dependencies from https://github.com/dotnet/arcade build 20250129.2 (dotnet#111996) Try changing the ICustomQueryInterface implementation to always return NotHandled instead of Failed to defer back to the ComWrappers impl. (dotnet#111978) Combined dependency update (dotnet#111852) Replace OPTIMIZE_FOR_SIZE with feature switch (dotnet#111743) Fix failed assertion 'FPbased == FPbased2' (dotnet#111787) Add remark to `ConditionalSelect` (dotnet#111945) JIT: fix try region cloning when try is nested in a handler (dotnet#111975) Use IRootFunctions in Tensor.StdDev (dotnet#110641) Remove zlib dependencies from Docker containers (dotnet#111939) Avoid `Unsafe.As` for `Memory<T>` and `ReadOnlyMemory<T>` conversion (dotnet#111023) Cleanup membarrier portability (dotnet#111943) ...

JeroenBer · 2025-02-15T11:00:44Z

@matouskozak
Will this fix be in 9.0.3 ?

tarekgh · 2025-02-15T18:27:10Z

This doesn’t seem to have made the cutoff for .NET servicing 9.0.3, so it will most likely be included in the 9.0.4 release in April.

JeroenBer · 2025-02-15T19:40:30Z

Where can I track that ? I don't see any 9.0.3 cutoff ?
9.0.2 was just released.

matouskozak · 2025-02-17T11:59:11Z

Where can I track that ? I don't see any 9.0.3 cutoff ? 9.0.2 was just released.

The cutoff for servicing X usually happens around the time the servicing X-1 is released.

Fix IndexOf on empty strings on iOS to return -1

8be351c

matouskozak added area-System.Globalization os-ios Apple iOS labels Jan 28, 2025

matouskozak self-assigned this Jan 28, 2025

add comments to test cases

4473af6

matouskozak marked this pull request as ready for review January 28, 2025 17:01

matouskozak requested review from akoeplinger, ilonatommy, ivanpovazan, steveisok and tarekgh January 28, 2025 17:02

tarekgh reviewed Jan 28, 2025

View reviewed changes

tarekgh approved these changes Jan 28, 2025

View reviewed changes

steveisok approved these changes Jan 28, 2025

View reviewed changes

matouskozak requested a review from vitek-karas January 30, 2025 05:27

vitek-karas reviewed Jan 30, 2025

View reviewed changes

vitek-karas approved these changes Jan 30, 2025

View reviewed changes

matouskozak merged commit 4e01649 into dotnet:main Jan 30, 2025
218 of 221 checks passed

matouskozak mentioned this pull request Jan 30, 2025

[release/9.0-staging][iOS][globalization] Fix IndexOf on empty strings on iOS to return -1 #112012

Merged

4 tasks

github-actions bot locked and limited conversation to collaborators Mar 20, 2025

Conversation

matouskozak commented Jan 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dotnet-policy-service bot commented Jan 28, 2025

Uh oh!

matouskozak commented Jan 28, 2025

Uh oh!

azure-pipelines bot commented Jan 28, 2025

Uh oh!

matouskozak commented Jan 28, 2025

Uh oh!

azure-pipelines bot commented Jan 28, 2025

Uh oh!

tarekgh Jan 28, 2025

Choose a reason for hiding this comment

Uh oh!

matouskozak commented Jan 29, 2025

Uh oh!

azure-pipelines bot commented Jan 29, 2025

Uh oh!

vitek-karas left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

matouskozak commented Jan 30, 2025

Uh oh!

github-actions bot commented Jan 30, 2025

Uh oh!

github-actions bot commented Jan 30, 2025

Uh oh!

JeroenBer commented Feb 15, 2025

Uh oh!

tarekgh commented Feb 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JeroenBer commented Feb 15, 2025

Uh oh!

matouskozak commented Feb 17, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

matouskozak commented Jan 28, 2025 •

edited

Loading

tarekgh commented Feb 15, 2025 •

edited

Loading