Missing SortKey changes + fix HashCode.

dotnet · ilonatommy · Jan 19, 2024 · Dec 29, 2023 · Dec 29, 2023 · Dec 29, 2023
commit 6e72858e44994d37bbfd0e22ef3447bf4ac1eb60
diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.cs
@@ -1496,7 +1496,7 @@ private int GetSortKeyCore(ReadOnlySpan<char> source, Span<byte> destination, Co
                 NlsGetSortKey(source, destination, options) :
 #if TARGET_BROWSER
             GlobalizationMode.Hybrid ?
-                throw new PlatformNotSupportedException(GetPNSEText("SortKey")) :
+                InvariantGetSortKey(source, destination, options)) :
 #endif
                 IcuGetSortKey(source, destination, options);
 
@@ -1533,7 +1533,7 @@ private int GetSortKeyLengthCore(ReadOnlySpan<char> source, CompareOptions optio
               NlsGetSortKeyLength(source, options) :
 #if TARGET_BROWSER
             GlobalizationMode.Hybrid ?
-              throw new PlatformNotSupportedException(GetPNSEText("SortKey")) :
+              InvariantGetSortKeyLength(source, options) :
 #endif
               IcuGetSortKeyLength(source, options);
 
@@ -1572,7 +1572,12 @@ public int GetHashCode(ReadOnlySpan<char> source, CompareOptions options)
                 // Pass the flags down to NLS or ICU unless we're running in invariant
                 // mode, at which point we normalize the flags to Ordinal[IgnoreCase].
 
+#if TARGET_BROWSER
+                if (!GlobalizationMode.Invariant && !GlobalizationMode.Hybrid)
+                // JS cannot create locale-sensitive HashCode, use invaraint functions instead
+#else
                 if (!GlobalizationMode.Invariant)
+#endif
                 {
                     return GetHashCodeOfStringCore(source, options);
                 }
@@ -1608,10 +1613,6 @@ public int GetHashCode(ReadOnlySpan<char> source, CompareOptions options)
         private unsafe int GetHashCodeOfStringCore(ReadOnlySpan<char> source, CompareOptions options) =>
             GlobalizationMode.UseNls ?
                 NlsGetHashCodeOfString(source, options) :
-#if TARGET_BROWSER
-            GlobalizationMode.Hybrid ?
-                throw new PlatformNotSupportedException(GetPNSEText("HashCode")) :
-#endif
                 IcuGetHashCodeOfString(source, options);
 
         public override string ToString() => "CompareInfo - " + Name;

diff --git a/...libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.cs b/...libraries/System.Runtime/tests/System.Globalization.Tests/CompareInfo/CompareInfoTests.cs
@@ -355,42 +355,6 @@ public void SortKeyKanaTest(CompareInfo compareInfo, string string1, string stri
             SortKeyTest(compareInfo, string1, string2, options, expected);
         }
 
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsHybridGlobalizationOnBrowser))]
-        public void SortKeyTestNotSupported()
-        {
-            try
-            {
-                s_invariantCompare.GetSortKey("");
-                AssertNotReached();
-            }
-            catch(PlatformNotSupportedException pnse)
-            {
-                Assert.Equal(GetPNSEText("SortKey"), pnse.Message);
-            }
-            try
-            {
-                s_invariantCompare.GetSortKeyLength(ReadOnlySpan<char>.Empty);
-                AssertNotReached();
-            }
-            catch(PlatformNotSupportedException pnse)
-            {
-                Assert.Equal(GetPNSEText("SortKey"), pnse.Message);
-            }
-
-            try
-            {
-                s_invariantCompare.GetHashCode("", CompareOptions.None);
-                AssertNotReached();
-            }
-            catch(PlatformNotSupportedException pnse)
-            {
-                Assert.Equal(GetPNSEText("HashCode"), pnse.Message);
-            }
-
-            string GetPNSEText(string funcName) => $"{funcName} is not supported when HybridGlobalization=true. Disable it to load larger ICU bundle, then use this option.";
-            void AssertNotReached() => Assert.Fail();
-        }
-
         [DllImport("kernel32", CharSet = CharSet.Unicode)]
         private static extern int CompareStringEx(string lpLocaleName, uint dwCmpFlags, string lpString1, int cchCount1, string lpString2, int cchCount2, IntPtr lpVersionInformation, IntPtr lpReserved, int lParam);
         private const int NORM_LINGUISTIC_CASING = 0x08000000;       // use linguistic rules for casing