more general Unicode property escapes handling (issue #583)

rbri · rbri · commit 470666f2294f · 2023-04-26T10:30:49.000+02:00
diff --git a/src/main/java/org/htmlunit/javascript/regexp/RegExpJsToJavaConverter.java b/src/main/java/org/htmlunit/javascript/regexp/RegExpJsToJavaConverter.java
@@ -49,7 +49,11 @@ public class RegExpJsToJavaConverter {
     static {
         UNICODE_ESCAPES = new HashMap<>();
         UNICODE_ESCAPES.put("L", "L");
-        UNICODE_ESCAPES.put("Letter", "L");
+        UNICODE_ESCAPES.put("LETTER", "L");
+        UNICODE_ESCAPES.put("LU", "Lu");
+        UNICODE_ESCAPES.put("UPPERCASELETTER", "Lu");
+        UNICODE_ESCAPES.put("LL", "Ll");
+        UNICODE_ESCAPES.put("LOWERCASELETTER", "Ll");
     }
 
     /**
@@ -392,12 +396,7 @@ private void processEscapeSequence() {
                     }
                     while (next > -1 && next != '}');
                     if (next == '}') {
-                        final String escape = tape_.tape_.substring(uPos, tape_.currentPos_ - 1);
-                        final String replace = UNICODE_ESCAPES.get(escape);
-                        if (replace != null) {
-                            tape_.tape_.replace(uPos, uPos + escape.length(), replace);
-                            return;
-                        }
+                        return;
                     }
 
                     // back to the old behavior
diff --git a/src/test/java/org/htmlunit/javascript/regexp/RegExpJsToJavaConverter2Test.java b/src/test/java/org/htmlunit/javascript/regexp/RegExpJsToJavaConverter2Test.java
@@ -91,11 +91,37 @@ public void validationPatternUnicodeCodePointEscapesFails() throws Exception {
      */
     @Test
     @Alerts("true")
-    public void validationPatternUnicodePropertyEscapeL() throws Exception {
+    public void validationPatternUnicodePropertyEscapeLetter() throws Exception {
         validation("\\p{L}*", "Html");
         validation("\\p{L}*", "&#x043C&#x0439&#x0440");
     }
 
+    /**
+     * @throws Exception if an error occurs
+     */
+    @Test
+    @Alerts("true")
+    public void validationPatternUnicodePropertyEscapeUppercaseLetter() throws Exception {
+        validation("\\p{Lu}*", "HTML");
+        validation("\\p{Lu}*", "&#x041C&#x0419&#x0420");
+        validation("\\p{uppercase letter}*", "&#x041C&#x0419&#x0420");
+        validation("\\p{Uppercase Letter}*", "&#x041C&#x0419&#x0420");
+        validation("\\p{Uppercase_Letter}*", "&#x041C&#x0419&#x0420");
+        validation("\\p{Uppercase-Letter}*", "&#x041C&#x0419&#x0420");
+        validation("\\p{uppercaseletter}*", "&#x041C&#x0419&#x0420");
+    }
+
+
+    /**
+     * @throws Exception if an error occurs
+     */
+    @Test
+    @Alerts("true")
+    public void validationPatternUnicodePropertyEscapeLowercaseLetter() throws Exception {
+        validation("\\p{Ll}*", "html");
+        validation("\\p{Ll}*", "&#x043C&#x0439&#x0440");
+    }
+
     private void validation(final String pattern, final String value) throws Exception {
         final String html =
                 "<html><head>\n"
diff --git a/src/test/java/org/htmlunit/javascript/regexp/RegExpJsToJavaConverterTest.java b/src/test/java/org/htmlunit/javascript/regexp/RegExpJsToJavaConverterTest.java
@@ -392,7 +392,10 @@ public void unicodePropertyEscapes() {
         final RegExpJsToJavaConverter regExpJsToJavaConverter = new RegExpJsToJavaConverter();
 
         assertEquals("\\p{L}0-9", regExpJsToJavaConverter.convert("\\p{L}0-9"));
-        assertEquals("\\p{L}0-9", regExpJsToJavaConverter.convert("\\p{Letter}0-9"));
+        assertEquals("\\p{Letter}0-9", regExpJsToJavaConverter.convert("\\p{Letter}0-9"));
+
+        assertEquals("\\p{Lu}0-9", regExpJsToJavaConverter.convert("\\p{Lu}0-9"));
+        assertEquals("\\p{Ll}0-9", regExpJsToJavaConverter.convert("\\p{Ll}0-9"));
 
         assertEquals("p\\{html\\}0-9", regExpJsToJavaConverter.convert("\\p{html}0-9"));
     }
