Preprocess unicode escapes when parsing using JavaParser (#6632)

typetools · Jun 3, 2024 · c85eb69 · c85eb69
1 parent 959822a
commit c85eb69
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/framework/src/main/java/org/checkerframework/framework/util/JavaParserUtil.java b/framework/src/main/java/org/checkerframework/framework/util/JavaParserUtil.java
@@ -61,6 +61,7 @@ public class JavaParserUtil {
   public static CompilationUnit parseCompilationUnit(InputStream inputStream) {
     ParserConfiguration parserConfiguration = new ParserConfiguration();
     parserConfiguration.setLanguageLevel(DEFAULT_LANGUAGE_LEVEL);
+    parserConfiguration.setPreprocessUnicodeEscapes(true);
     JavaParser javaParser = new JavaParser(parserConfiguration);
     ParseResult<CompilationUnit> parseResult = javaParser.parse(inputStream);
     if (parseResult.isSuccessful() && parseResult.getResult().isPresent()) {
@@ -86,6 +87,7 @@ public static CompilationUnit parseCompilationUnit(InputStream inputStream) {
   public static CompilationUnit parseCompilationUnit(File file) throws FileNotFoundException {
     ParserConfiguration configuration = new ParserConfiguration();
     configuration.setLanguageLevel(DEFAULT_LANGUAGE_LEVEL);
+    configuration.setPreprocessUnicodeEscapes(true);
     JavaParser javaParser = new JavaParser(configuration);
     ParseResult<CompilationUnit> parseResult = javaParser.parse(file);
     if (parseResult.isSuccessful() && parseResult.getResult().isPresent()) {
@@ -142,6 +144,7 @@ public static StubUnit parseStubUnit(InputStream inputStream) {
     configuration.setLexicalPreservationEnabled(false);
     configuration.setAttributeComments(false);
     configuration.setDetectOriginalLineSeparator(false);
+    configuration.setPreprocessUnicodeEscapes(true);
     JavaParser javaParser = new JavaParser(configuration);
     ParseResult<StubUnit> parseResult = javaParser.parseStubUnit(inputStream);
     if (parseResult.isSuccessful() && parseResult.getResult().isPresent()) {
@@ -188,6 +191,7 @@ public static Expression parseExpression(String expression, LanguageLevel langua
     configuration.setLexicalPreservationEnabled(false);
     configuration.setAttributeComments(false);
     configuration.setDetectOriginalLineSeparator(false);
+    configuration.setPreprocessUnicodeEscapes(true);
     JavaParser javaParser = new JavaParser(configuration);
     ParseResult<Expression> parseResult = javaParser.parseExpression(expression);
     if (parseResult.isSuccessful() && parseResult.getResult().isPresent()) {

diff --git a/framework/tests/all-systems/UnicodeEscape.java b/framework/tests/all-systems/UnicodeEscape.java
@@ -0,0 +1,9 @@
+// Test case for https://github.com/typetools/checker-framework/issues/6631.
+
+public class UnicodeEscape {
+  void foo() {
+    while (true) {
+      System.out.print("Enter an expression like \u005c"1+(2+3)*4;\u005c" :");
+    }
+  }
+}