Java 21: Pattern Matching + StringTemplate JEP-430 + Unnamed JEP-445

Author: npeters

build.gradle

@@ -1,5 +1,6 @@
 buildscript {
     repositories {
+        mavenLocal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
         mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
         gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
     }
@@ -40,6 +41,7 @@ allprojects {
     version = rootProject.version
 
     repositories {
+        mavenLocal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
         mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
     }
 }
@@ -48,8 +50,7 @@ subprojects {
     apply plugin: 'java-library'
     apply plugin: 'org.inferred.processors'
 
-    sourceCompatibility = 11
-    targetCompatibility = 11
+
 
     tasks.withType(Checkstyle).configureEach {
         enabled = false

gradle-palantir-java-format/build.gradle

@@ -10,6 +10,10 @@ configurations {
         canBeResolved = true
     }
 }
+java{
+    sourceCompatibility = 11
+    targetCompatibility = 11
+}
 
 dependencies {
     compileOnly 'com.diffplug.spotless:spotless-plugin-gradle'

idea-plugin/build.gradle

@@ -61,6 +61,11 @@ configurations {
     }
 }
 
+java{
+    sourceCompatibility = 11
+    targetCompatibility = 11
+}
+
 dependencies {
     implementation project(':palantir-java-format-jdk-bootstrap')
     implementation 'com.github.ben-manes.caffeine:caffeine'

palantir-java-format-jdk-bootstrap/build.gradle

@@ -2,6 +2,11 @@ apply plugin: 'java-library'
 apply plugin: 'com.palantir.external-publish-jar'
 apply plugin: 'com.palantir.revapi'
 
+java{
+    sourceCompatibility = 11
+    targetCompatibility = 11
+}
+
 dependencies {
     annotationProcessor "org.immutables:value"
 

palantir-java-format-jdk-bootstrap/src/main/java/com/palantir/javaformat/bootstrap/BootstrappingFormatterService.java

@@ -163,11 +163,17 @@ final class Builder extends ImmutableFormatterCliArgs.Builder {
             Builder withJvmArgsForVersion(Integer majorJvmVersion) {
                 if (majorJvmVersion >= 16) {
                     addJvmArgs(
-                            "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
-                            "--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
-                            "--add-exports", "jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
-                            "--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
-                            "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED");
+                            "--enable-preview",
+                            "--add-exports",
+                            "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+                            "--add-exports",
+                            "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+                            "--add-exports",
+                            "jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+                            "--add-exports",
+                            "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+                            "--add-exports",
+                            "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED");
                 }
                 return this;
             }

palantir-java-format-spi/build.gradle

@@ -2,6 +2,11 @@ apply plugin: 'java-library'
 apply plugin: 'com.palantir.external-publish-jar'
 apply plugin: 'com.palantir.revapi'
 
+java{
+    sourceCompatibility = 11
+    targetCompatibility = 11
+}
+
 dependencies {
     api 'com.google.guava:guava'
     api 'com.fasterxml.jackson.core:jackson-annotations'

palantir-java-format/build.gradle

@@ -1,3 +1,5 @@
+
+
 apply plugin: 'application'
 apply plugin: 'com.palantir.external-publish-jar'
 
@@ -79,7 +81,7 @@ tasks.named("test") {
 
 // necessary to compile Java14InputAstVisitor
 idea {
-    module.languageLevel = new org.gradle.plugins.ide.idea.model.IdeaLanguageLevel(14)
+    module.languageLevel = new org.gradle.plugins.ide.idea.model.IdeaLanguageLevel(17)
 }
 
 // This block may be replaced by BaselineExportsExtension exports
@@ -89,3 +91,11 @@ tasks.named("jar", Jar) {
         attributes('Add-Exports': exports.join(' '))
     }
 }
+
+tasks.named('jar', Jar){
+    // hack to get java21 Class ...
+    // the build script should be completely review to handle java 21
+    from ('build/classes/java/main', '../palantir-java-format21/build/classes/java/main')
+
+    include('**/*')
+}

palantir-java-format/src/main/java/com/palantir/javaformat/java/Formatter.java

@@ -131,7 +131,17 @@ static JavaOutput format(
         OpsBuilder opsBuilder = new OpsBuilder(javaInput);
 
         JavaInputAstVisitor visitor;
-        if (getRuntimeVersion() >= 14) {
+
+        if (getRuntimeVersion() >= 21) {
+            try {
+                visitor = Class.forName("com.palantir.javaformat.java.java21.Java21InputAstVisitor")
+                        .asSubclass(JavaInputAstVisitor.class)
+                        .getConstructor(OpsBuilder.class, int.class)
+                        .newInstance(opsBuilder, options.indentationMultiplier());
+            } catch (ReflectiveOperationException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+        } else if (getRuntimeVersion() >= 14) {
             try {
                 visitor = Class.forName("com.palantir.javaformat.java.java14.Java14InputAstVisitor")
                         .asSubclass(JavaInputAstVisitor.class)

palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInput.java

@@ -370,22 +370,60 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
         List<Tok> toks = new ArrayList<>();
         int charI = 0;
         int columnI = 0;
+        int stringFragmentEndPos = -1;
+
         for (RawTok t : rawToks) {
             if (stopTokens.contains(t.kind())) {
                 break;
             }
             int charI0 = t.pos();
+
+            /**
+             *  String Templates : https://openjdk.org/jeps/430
+             *  "String Template" tokenize like that :  {STRINGFRAGMENT}{literal}{STRINGFRAGMENT} and after list of parameters
+             *  for exemple:
+             *  `String s = STR."\{fruit[0]} is nice";`
+             *   will give this token  (STRINGFRAGMENT)""" , (literal)fruit[0] ,(STRINGFRAGMENT)" is nice" and after "fruit[0]" again with a potion of fruit[0] on file
+             *
+             *   for this reason we comme back after the position of the last  STRINGFRAGMENT
+             */
+            if (t.pos() < stringFragmentEndPos && stringFragmentEndPos < t.endPos()) {
+                // case System.out.println(STR."  \{o} ---"  );
+                // on this case  tokTex == " ---\"  " but we already add the token " ---\""
+                // it is why we recreate a new token with only "  " (after \" )
+
+                charI0 = stringFragmentEndPos;
+                t = new RawTok("", t.kind(), stringFragmentEndPos, t.endPos());
+            }
+
+            if (t.pos() == stringFragmentEndPos) {
+                // reset when it come back exactly to the same position: System.out.println(STR."  \{o}");
+                stringFragmentEndPos = -1;
+            }
+
+            // drop token when after STRINGFRAGMENT when it comme back
+            if (t.pos() < stringFragmentEndPos) {
+                continue;
+            }
+            boolean stringFragmentKind =
+                    (t.kind() != null && "STRINGFRAGMENT".equals(t.kind().name()));
+
+            // end String Templates
+
             // Get string, possibly with Unicode escapes.
             String originalTokText = text.substring(charI0, t.endPos());
-            String tokText = t.kind() == TokenKind.STRINGLITERAL
+
+            String tokText = (t.kind() == TokenKind.STRINGLITERAL)
                     ? t.stringVal() // Unicode escapes removed.
                     : originalTokText;
+
             char tokText0 = tokText.charAt(0); // The token's first character.
             final boolean isToken; // Is this tok a token?
             final boolean isNumbered; // Is this tok numbered? (tokens and comments)
             String extraNewline = null; // Extra newline at end?
             List<String> strings = new ArrayList<>();
-            if (Character.isWhitespace(tokText0)) {
+
+            if (Character.isWhitespace(tokText0) && !stringFragmentKind) {
                 isToken = false;
                 isNumbered = false;
                 Iterator<String> it = Newlines.lineIterator(originalTokText);
@@ -402,10 +440,14 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
                         strings.add(line);
                     }
                 }
-            } else if (tokText.startsWith("'") || tokText.startsWith("\"")) {
+            } else if (tokText.startsWith("'") || tokText.startsWith("\"") || stringFragmentKind) {
                 isToken = true;
                 isNumbered = true;
                 strings.add(originalTokText);
+                if (stringFragmentKind) {
+                    stringFragmentEndPos = t.endPos();
+                }
+
             } else if (tokText.startsWith("//") || tokText.startsWith("/*")) {
                 // For compatibility with an earlier lexer, the newline after a // comment is its own tok.
                 if (tokText.startsWith("//") && (originalTokText.endsWith("\n") || originalTokText.endsWith("\r"))) {

palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java

@@ -394,6 +394,7 @@ protected void handleModule(boolean first, CompilationUnitTree node) {}
 
     /** Skips over extra semi-colons at the top-level, or in a class member declaration lists. */
     protected void dropEmptyDeclarations() {
+
         if (builder.peekToken().equals(Optional.of(";"))) {
             while (builder.peekToken().equals(Optional.of(";"))) {
                 builder.forcedBreak();