Merge pull request #3251 from Rawi01/jdk19

Add support for JDK 19

2 files changed, 39 insertions, 0 deletions

diff --git a/src/delombok/lombok/delombok/PrettyPrinter.java b/src/delombok/lombok/delombok/PrettyPrinter.java
index 605b9391..13836d77 100644
--- a/src/delombok/lombok/delombok/PrettyPrinter.java
+++ b/src/delombok/lombok/delombok/PrettyPrinter.java
@@ -1448,6 +1448,31 @@ public class PrettyPrinter extends JCTree.Visitor {
 		print(")");
 	}
 	
+	void printConstantCaseLabel(JCTree tree) {
+		print((JCTree) readObject(tree, "expr", null));
+	}
+	
+	void printPatternCaseLabel(JCTree tree) {
+		print((JCTree) readObject(tree, "pat", null));
+		JCTree guard = readObject(tree, "guard", null);
+		if (guard != null) {
+			print(" when ");
+			print(guard);
+		}
+	}
+	
+	void printRecordPattern(JCTree tree) {
+		print((JCTree) readObject(tree, "deconstructor", null));
+		print("(");
+		print(readObject(tree, "nested", List.<JCTree>nil()), ", ");
+		print(")");
+		JCVariableDecl var = readObject(tree, "var", null);
+		if (var != null) {
+			print(" ");
+			print(var.name);
+		}
+	}
+	
 	@Override public void visitTry(JCTry tree) {
 		aPrint("try ");
 		List<?> resources = readObject(tree, "resources", List.nil());
@@ -1672,6 +1697,12 @@ public class PrettyPrinter extends JCTree.Visitor {
 			printGuardPattern(tree);
 		} else if (className.endsWith("$JCParenthesizedPattern")) { // Introduced in JDK17
 			printParenthesizedPattern(tree);
+		} else if (className.endsWith("$JCConstantCaseLabel")) { // Introduced in JDK19
+			printConstantCaseLabel(tree);
+		} else if (className.endsWith("$JCPatternCaseLabel")) { // Introduced in JDK19
+			printPatternCaseLabel(tree);
+		} else if (className.endsWith("$JCRecordPattern")) { // Introduced in JDK19
+			printRecordPattern(tree);
 		} else {
 			throw new AssertionError("Unhandled tree type: " + tree.getClass() + ": " + tree);
 		}
diff --git a/src/utils/lombok/javac/JavacTreeMaker.java b/src/utils/lombok/javac/JavacTreeMaker.java
index d369b4e4..09855951 100644
--- a/src/utils/lombok/javac/JavacTreeMaker.java
+++ b/src/utils/lombok/javac/JavacTreeMaker.java
@@ -610,6 +610,8 @@ public class JavacTreeMaker {
 		List<JCTree> labels;
 		if (pat == null) {
 			labels = tryResolve(DefaultCaseLabel) ? List.of(DefaultCaseLabel()) : List.<JCTree>nil();
+		} else if (tryResolve(ConstantCaseLabel)) {
+			labels = List.<JCTree>of(ConstantCaseLabel(pat));
 		} else {
 			labels = List.<JCTree>of(pat);
 		}
@@ -622,6 +624,12 @@ public class JavacTreeMaker {
 		return invoke(DefaultCaseLabel);
 	}
 	
+	//javac versions: 19
+	private static final MethodId<JCTree> ConstantCaseLabel = MethodId("ConstantCaseLabel", JCTree.class, JCExpression.class);
+	public JCTree ConstantCaseLabel(JCExpression expr) {
+		return invoke(ConstantCaseLabel, expr);
+	}
+	
 	//javac versions: 6-8
 	private static final MethodId<JCSynchronized> Synchronized = MethodId("Synchronized");
 	public JCSynchronized Synchronized(JCExpression lock, JCBlock body) {