Make our own Java identifier methods. ()

Java has changed set of unicodes between Java 17 and Java 21 so relying on Java's method would lead to breaking changes when switching JDK.
neo4j · Nov 11, 2023 · 8dd199a · 8dd199a
1 parent fa9d53a
commit 8dd199a
Show file tree

Hide file tree

Showing 5 changed files with 892 additions and 9 deletions.
diff --git a/...d/ast/src/main/scala/org/neo4j/cypher/internal/ast/prettifier/ExpressionStringifier.scala b/...d/ast/src/main/scala/org/neo4j/cypher/internal/ast/prettifier/ExpressionStringifier.scala
@@ -117,6 +117,7 @@ import org.neo4j.cypher.internal.label_expressions.LabelExpression.Wildcard
 import org.neo4j.cypher.internal.label_expressions.LabelExpressionPredicate
 import org.neo4j.cypher.internal.logical.plans.CoerceToPredicate
 import org.neo4j.cypher.internal.util.InputPosition
+import org.neo4j.cypher.internal.util.UnicodeHelper
 
 trait ExpressionStringifier {
   def apply(ast: Expression): String
@@ -611,11 +612,9 @@ object ExpressionStringifier {
     else {
       val isJavaIdentifier =
         txt.codePoints().limit(1).allMatch(p =>
-          (Character.isJavaIdentifierStart(p) && Character.getType(
-            p
-          ) != Character.CURRENCY_SYMBOL) || orGlobbedCharacter(p)
+          UnicodeHelper.isIdentifierStart(p) || orGlobbedCharacter(p)
         ) &&
-          txt.codePoints().skip(1).allMatch(p => Character.isJavaIdentifierPart(p) || orGlobbedCharacter(p))
+          txt.codePoints().skip(1).allMatch(p => UnicodeHelper.isIdentifierPart(p) || orGlobbedCharacter(p))
       if (!isJavaIdentifier)
         s"`$escaped`"
       else

diff --git a/...src/test/scala/org/neo4j/cypher/internal/frontend/prettifier/PrettifierPropertyTest.scala b/...src/test/scala/org/neo4j/cypher/internal/frontend/prettifier/PrettifierPropertyTest.scala
@@ -34,7 +34,6 @@ class PrettifierPropertyTest extends CypherFunSuite
   implicit val config: PropertyCheckConfiguration = PropertyCheckConfiguration(minSuccessful = 5000)
 
   test("Prettifier output should parse to the same ast") {
-    assume(Runtime.version().feature() < 21)
     // To reproduce test failures, enable the following line with the seed from the TC build
     // setScalaCheckInitialSeed(seed)
     forAll(astGenerator._statement) { statement =>

diff --git a/...r/front-end/javacc-parser/src/main/java/org/neo4j/cypher/internal/parser/javacc/cypher.jj b/...r/front-end/javacc-parser/src/main/java/org/neo4j/cypher/internal/parser/javacc/cypher.jj
@@ -674,7 +674,7 @@ TOKEN :
 {
     < IDENTIFIER: <LETTER> (<PART_LETTER>)* >
     | < #LETTER:
-        [  // all chars for which Character.isJavaIdentifierStart(c) && Character.getType(c) != Character.CURRENCY_SYMBOL is true
+        [  // all chars for which Character.isJavaIdentifierStart(c) && Character.getType(c) != Character.CURRENCY_SYMBOL is true (in Java 17)
             "\u0041"-"\u005a",
             "\u005f",
             "\u0061"-"\u007a",
@@ -1064,7 +1064,7 @@ TOKEN :
             "\uffda"-"\uffdc"
         ] >
     | < #PART_LETTER:
-        [  // all chars for which Character.isIdentifierPart is true
+        [  // all chars for which Character.isIdentifierPart is true (in Java 17)
             "\u0000"-"\u0008",
             "\u000e"-"\u001b",
             "\u0024",