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

npeters · 2023-10-03T01:05:10Z

Before this PR

May error on parsing Java 21 file.

After this PR

Support of different JEP of Java 21 and preview

JEP-430 StringTemplates
JEP-440 Record Patterns
JEP-441 Pattern Matching switch (with guard)
JEP-443 Unamed Pattern

Possible downsides?

Build

I added a independent gradle module to build all Java 21 code but the gradle do not support to build groovy code with java 21: it should be first compile with java 17 and you can compile the project with java 21 😞
I added a hack on palantir-java-format gradle script to copy all the java 21 class file on the jar. 😞
Need to add --enable-preview with Java 21.

Code

"StringTemplates" was really hard to support: I did some change on JavaInput.java and visitStringTemplate. The complexity of this part is really to high.
I copy and past "visitCase" from Java14 file and the guard param.

palantirtech · 2023-10-03T01:05:12Z

Thanks for your interest in palantir/palantir-java-format, @npeters! Before we can accept your pull request, you need to sign our contributor license agreement - just visit https://cla.palantir.com/ and follow the instructions. Once you sign, I'll automatically update this pull request.

changelog-app · 2023-10-03T01:05:13Z

Generate changelog in `changelog/@unreleased`

What do the change types mean?

feature: A new feature of the service.
improvement: An incremental improvement in the functionality or operation of the service.
fix: Remedies the incorrect behaviour of a component of the service in a backwards-compatible way.
break: Has the potential to break consumers of this service's API, inclusive of both Palantir services
and external consumers of the service's API (e.g. customer-written software or integrations).
deprecation: Advertises the intention to remove service functionality without any change to the
operation of the service itself.
manualTask: Requires the possibility of manual intervention (running a script, eyeballing configuration,
performing database surgery, ...) at the time of upgrade for it to succeed.
migration: A fully automatic upgrade migration task with no engineer input required.

Note: only one type should be chosen.

How are new versions calculated?

❗The break and manual task changelog types will result in a major release!
🐛 The fix changelog type will result in a minor release in most cases, and a patch release version for patch branches. This behaviour is configurable in autorelease.
✨ All others will result in a minor version release.

Type

Description

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

Check the box to generate changelog(s)

Generate changelog entry

npeters · 2023-10-03T01:25:43Z

The build is so painful... I push all the jar / idea-plugin https://github.com/npeters/palantir-java-format/releases/tag/java21-draft.

npeters · 2023-10-03T01:27:31Z

link to #934 #933 #931

kittech0 · 2023-10-27T08:26:54Z

great job, now gotta wait for approval

koppor

I was going to use palantir-java-format and saw this PR. I read through and commented on code changes appearing unusual to me. Feel free to use or to ignore - I am not affiliated with the project, just some Java project lead.

koppor · 2023-10-28T19:01:46Z

build.gradle

-    sourceCompatibility = 11
-    targetCompatibility = 11


I would keep as is - and remove the "duplicate" settings in the sub projects.

koppor · 2023-10-28T19:02:35Z

gradle-palantir-java-format/build.gradle

+java{
+    sourceCompatibility = 11
+    targetCompatibility = 11
+}


This can be removed (because configured globally)

koppor · 2023-10-28T19:02:41Z

idea-plugin/build.gradle

+java{
+    sourceCompatibility = 11
+    targetCompatibility = 11
+}
+


This can be removed (because configured globally)

koppor · 2023-10-28T19:02:49Z

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

+java{
+    sourceCompatibility = 11
+    targetCompatibility = 11
+}
+


This can be removed (because configured globally)

koppor · 2023-10-28T19:03:10Z

palantir-java-format-spi/build.gradle

+java{
+    sourceCompatibility = 11
+    targetCompatibility = 11
+}
+


This can be removed (because configured globally)

koppor · 2023-10-28T19:06:32Z

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

+                if (stringFragmentKind) {
+                    stringFragmentEndPos = t.endPos();
+                }
+


Remove empty line

koppor · 2023-10-28T19:06:40Z

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() {
+


Remove empty line

koppor · 2023-10-28T19:07:03Z

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/B28788559.input

-import a.A;;
+import a.A;


Why was the test input changed?

";;" is not valid on java 21.
"Disallow Extra Semicolons Between "import" Statements"
https://www.oracle.com/java/technologies/javase/21-relnote-issues.html#JDK-8027682

I was not able to disable the test only for Java21

koppor · 2023-10-28T19:07:15Z

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/CL240367479.input

-package foo;;
+package foo;


Why was the test input changed?

";;" is not valid on java 21.
"Disallow Extra Semicolons Between "import" Statements"
https://www.oracle.com/java/technologies/javase/21-relnote-issues.html#JDK-8027682

I was not able to disable the test only for Java21

koppor · 2023-10-28T19:08:51Z

...r-java-format21/src/main/java/com/palantir/javaformat/java/java21/Java21InputAstVisitor.java

+        Void r = scan(node.getDeconstructor(), unused);
+        token("(");
+
+        // r = scanAndReduceVoid(, unused, r);


What does this comment mean?

I remove it

talios · 2023-11-05T19:49:13Z

Has there been any progress on this PR? Would love to see a new release supporting Java 21.

CRogers · 2023-11-17T14:22:23Z

Thanks for submitting this PR - although we're unlikely to be able review it/actually support Java 21 in palantir-java-format by the end of the year. There's a significant amount of other work we need to do on our internal repos (currently ongoing) before we can start using Java 21 source features and these take priority. Unfortunately, we are quite resource constrained at the moment.

Until then, you may be able to use something like jitpack (https://jitpack.io/) if it is allowed by your organisation to use this commit hash until we are in a place to review/merging/supporting it.

koppor · 2023-11-20T15:18:28Z

The build is so painful... I push all the jar / idea-plugin npeters/palantir-java-format@java21-draft (release).

Is there also a chance for the gradle plugin? I also hit some issues and would like to test if the modification works with https://github.com/JabRef/jabref/blob/39569344d4051ac958e4fc5edda89866d0706498/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java#L63. (which is issue #952)

npeters · 2023-11-20T16:33:06Z

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/I961.input

+
+
+    switch (something){
+        case Integer i when i > 10-> System.out.println(i.toString());


the #952 should be fix and the test is here

npeters · 2023-11-20T16:35:04Z

yes, the PR should manage the #952. It is part of 'JEP-441 Pattern Matching switch (with guard)' .
There are already a test on the guard: sample is I961.

wb459 · 2024-02-21T14:37:54Z

@CRogers Is there any news regarding when the team will have the capacity to review this PR?

bmarwell · 2024-03-03T13:34:41Z

Thanks for submitting this PR - although we're unlikely to be able review it/actually support Java 21 in palantir-java-format by the end of the year.

End of WHICH year? 😄
Jokes aside – can you nominate more maintainers? A few ASF projects like maven use palantir and we would like to have property formatted source code. Maybe one of them could get access to palantir PRs and releases?

talios · 2024-04-07T02:18:21Z

In relation to this - StringTemplates as we currently no them are 100% dead and will not be in JDK 23, even under --enable-preview: https://mail.openjdk.org/pipermail/amber-spec-experts/2024-April/004106.html

anbonifacio · 2024-04-08T09:06:34Z

Maybe a smaller scope would be easier to review? What about limiting the support to the new pattern matching features like case null, defaut ->?

koppor · 2024-04-08T11:26:31Z

As far as I understand the whole setting, the whole endeavor is blocked by the release of version 2.0 of the IntelliJ Gradle Plugin, because of the fix JetBrains/intellij-platform-gradle-plugin#1494 is needed.

(Source: #997)

npeters · 2024-04-27T10:23:13Z

@koppor How can I assist you?
This PR seems too complex to merge and I understand.
Perhaps a better approach would be as follows:

Create one pull request with a Gradle configuration build that includes multi-compilation tasks and multi-test task, each targeting a specific JDK version.
Submit another pull request containing the Java code and associated tests

@koppor If you agree with this plan. I can try to do it.

npeters · 2024-04-27T10:27:40Z

@talios thank you for the point. We need to create a InputAstVisitor class for each java version.

xhyrom · 2024-05-12T16:49:10Z

How it's looking?

RealYusufIsmail · 2024-05-25T20:00:28Z

Yo, any updates in regard to the following changes.

siepkes · 2024-10-18T12:44:51Z

Since String templates was removed from JDK 23 (see: Update on String Templates (JEP 459) it should probably be removed from this PR?

npeters · 2024-11-02T17:40:06Z

Currently I am using this PR on my project and it works fine: so the java code work correctly.
I think the build is the problem: the second project and the hack to copy the class to jar are really bad.

Gradle has been updated and it is possible to support Java 21.

I completely rewrite the system:

I split the code for java 21 and java 21 preview,
I create sourceset for java21 and java21preview
the jar is now correctly built.

koppor reviewed Oct 28, 2023

View reviewed changes

koppor mentioned this pull request Nov 17, 2023

Switch to palantir-java-format JabRef/jabref-koppor#663

Closed

9 tasks

koppor mentioned this pull request Nov 20, 2023

Java 21 / JEP 441: Pattern Matching for switch result in com.palantir.javaformat.java.FormatterException #952

Open

npeters commented Nov 20, 2023

View reviewed changes

koppor mentioned this pull request Dec 5, 2023

Incompatible with JDK 21 #931

Open

npeters mentioned this pull request Apr 27, 2024

Gradle: Multi Compilation 21< and 21 #1079

Closed

npeters force-pushed the feature/java-21 branch from 396d2aa to 182fd9a Compare April 27, 2024 21:04

Sparky983 mentioned this pull request Jul 27, 2024

Switch to Google Java Format Sparky983/vision-gui#219

Merged

java21:reworks all the packaging

56b6eab

npeters force-pushed the feature/java-21 branch from 182fd9a to 56b6eab Compare November 2, 2024 17:22

		@@ -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() {



		switch (something){
		case Integer i when i > 10-> System.out.println(i.toString());

		import a.A;;
		import a.A;

		package foo;;
		package foo;

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

Are you sure you want to change the base?

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

Conversation

npeters commented Oct 3, 2023 • edited Loading

Before this PR

After this PR

Possible downsides?

Build

Code

palantirtech commented Oct 3, 2023

changelog-app bot commented Oct 3, 2023

Generate changelog in changelog/@unreleased

npeters commented Oct 3, 2023

npeters commented Oct 3, 2023

kittech0 commented Oct 27, 2023

koppor left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

talios commented Nov 5, 2023

CRogers commented Nov 17, 2023

koppor commented Nov 20, 2023 • edited Loading

Choose a reason for hiding this comment

npeters commented Nov 20, 2023

wb459 commented Feb 21, 2024

bmarwell commented Mar 3, 2024

talios commented Apr 7, 2024

anbonifacio commented Apr 8, 2024

koppor commented Apr 8, 2024

npeters commented Apr 27, 2024

npeters commented Apr 27, 2024

xhyrom commented May 12, 2024

RealYusufIsmail commented May 25, 2024

siepkes commented Oct 18, 2024

npeters commented Nov 2, 2024

npeters commented Oct 3, 2023 •

edited

Loading

Generate changelog in `changelog/@unreleased`

koppor commented Nov 20, 2023 •

edited

Loading