Review feedback

sebastienros · Jul 31, 2023 · e75968e · e75968e
1 parent ce5678f
commit e75968e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 36 deletions.
diff --git a/Jint/Native/RegExp/RegExpPrototype.cs b/Jint/Native/RegExp/RegExpPrototype.cs
@@ -942,11 +942,7 @@ private static JsValue RegExpBuiltinExec(JsRegExp R, string s)
 
             var e = match.Index + match.Length;
 
-            // .NET regexes doesn't returns code point indices
-            //if (fullUnicode)
-            //{
-            //    e = GetStringIndex(s, e);
-            //}
+            // NOTE: Even in Unicode mode, we don't need to translate indices as .NET regexes always return code unit indices.
 
             if (global || sticky)
             {
@@ -956,35 +952,6 @@ private static JsValue RegExpBuiltinExec(JsRegExp R, string s)
             return CreateReturnValueArray(R.Engine, matcher, match, s, fullUnicode, hasIndices);
         }
 
-        /// <summary>
-        /// https://tc39.es/ecma262/#sec-getstringindex
-        /// </summary>
-        //private static int GetStringIndex(string s, int codePointIndex)
-        //{
-        //    if (s.Length == 0)
-        //    {
-        //        return 0;
-        //    }
-
-        //    var len = s.Length;
-        //    var codeUnitCount = 0;
-        //    var codePointCount = 0;
-
-        //    while (codeUnitCount < len)
-        //    {
-        //        if (codePointCount == codePointIndex)
-        //        {
-        //            return codeUnitCount;
-        //        }
-
-        //        var isSurrogatePair = char.IsSurrogatePair(s, codeUnitCount);
-        //        codeUnitCount += isSurrogatePair ? 2 : 1;
-        //        codePointCount += 1;
-        //    }
-
-        //    return len;
-        //}
-
         private static JsArray CreateReturnValueArray(
             Engine engine,
             Regex regex,
@@ -1113,7 +1080,7 @@ private static JsValue GetMatchIndexPair(Engine engine, string s, JsNumber[] mat
             {
                 try
                 {
-                    var bytes = Shims.BytesFromHexString(groupNameFromNumber.AsSpan(encodedGroupNamePrefix.Length));
+                    var bytes = groupNameFromNumber.AsSpan(encodedGroupNamePrefix.Length).BytesFromHexString();
                     groupNameFromNumber = Encoding.UTF8.GetString(bytes);
                 }
                 catch { /* intentional no-op */ }

diff --git a/Jint/Shims.cs b/Jint/Shims.cs
@@ -2,7 +2,7 @@ namespace Jint;
 
 internal static class Shims
 {
-    public static byte[] BytesFromHexString(ReadOnlySpan<char> value)
+    public static byte[] BytesFromHexString(this ReadOnlySpan<char> value)
     {
 #if NET6_0_OR_GREATER
         return Convert.FromHexString(value);