Merge branch 'jdk23' of https://github.com/Rawi01/lombok into jdk23

rzwitserloot · rzwitserloot · commit 6454db6cec0c · 2024-10-18T00:13:53.000+02:00
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
@@ -41,10 +41,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     env:
-      EA_JDK: 22
+      EA_JDK: 23
     strategy: 
       matrix: 
-        jdk: [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22]
+        jdk: [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
         goal: [javacCurrent]
         include:
           - jdk: 11
@@ -168,14 +168,12 @@ jobs:
     needs: build
     strategy: 
       matrix: 
-        jdk: [8, 11, 17, 21, 22]
+        jdk: [8, 11, 17, 21, 23]
         tool: 
           - {name: "maven",  cmd: "mvn compile"}
           - {name: "gradle", cmd: "gradle assemble"}
           - {name: "ant",    cmd: "ant dist"}
           - {name: "bazel",  cmd: "bazel build //:ProjectRunner"}
-        exclude:
-          - {tool: {name: "gradle", cmd: "gradle assemble"}, jdk: 22}
       fail-fast: false
     env:
       IMAGE_NAME: lombok-${{ matrix.tool.name }}-jdk${{ matrix.jdk }}
diff --git a/docker/ant/files/jdk-23/classpath/build.xml b/docker/ant/files/jdk-23/classpath/build.xml
@@ -20,6 +20,7 @@
 			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
 			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
 			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
+			<compilerarg value="-proc:full"/>
 		</javac>
 	</target>
 	
diff --git a/docker/ant/files/jdk-23/modules/build.xml b/docker/ant/files/jdk-23/modules/build.xml
@@ -20,6 +20,7 @@
 			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
 			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
 			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
+			<compilerarg value="-proc:full"/>
 		</javac>
 	</target>
 	
diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile
@@ -7,9 +7,9 @@ RUN provision/jdk/java-${jdk}.sh
 ARG lombokjar=lombok.jar
 ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar
 
-ARG gradle=8.5
-ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh
-RUN provision/gradle/gradle-${gradle}.sh
+ARG gradle=8.10.2
+ADD provision/gradle/gradle.sh provision/gradle/gradle.sh
+RUN provision/gradle/gradle.sh ${gradle}
 
 FROM ubuntu:22.04
 
diff --git a/docker/maven/files/jdk-23/classpath/pom.xml b/docker/maven/files/jdk-23/classpath/pom.xml
@@ -7,7 +7,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>22</java.version>
+        <java.version>23</java.version>
     </properties>
 
     <build>
@@ -22,6 +22,7 @@
                     <showDeprecation>true</showDeprecation>
                     <showWarnings>true</showWarnings> 
                     <fork>true</fork>
+                    <proc>full</proc>
                     <compilerargs>
                         <arg>-Werror</arg>
                         <arg>-Xlint:all</arg>
diff --git a/docker/maven/files/jdk-23/modules/pom.xml b/docker/maven/files/jdk-23/modules/pom.xml
@@ -7,7 +7,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>22</java.version>
+        <java.version>23</java.version>
     </properties>
 
     <build>
diff --git a/docker/provision/gradle/gradle-6.8.3.sh b/docker/provision/gradle/gradle-6.8.3.sh
diff --git a/docker/provision/gradle/gradle-7.6.1.sh b/docker/provision/gradle/gradle-7.6.1.sh
diff --git a/docker/provision/gradle/gradle-8.3.sh b/docker/provision/gradle/gradle-8.3.sh
diff --git a/docker/provision/gradle/gradle.sh b/docker/provision/gradle/gradle.sh
@@ -1,4 +1,4 @@
 apt-get update && apt-get install -y wget unzip
-wget https://github.com/gradle/gradle-distributions/releases/download/v8.5.0/gradle-8.5-bin.zip -O gradle.zip
+wget https://github.com/gradle/gradle-distributions/releases/download/v$1/gradle-$1-bin.zip -O gradle.zip
 mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip
-mv /opt/gradle/gradle-8.5 /opt/gradle/gradle
+mv /opt/gradle/gradle-$1 /opt/gradle/gradle
diff --git a/docker/provision/jdk/java-22.sh b/docker/provision/jdk/java-22.sh
diff --git a/docker/provision/jdk/java-23.sh b/docker/provision/jdk/java-23.sh
@@ -0,0 +1,4 @@
+apt-get update && apt-get install -y wget
+wget https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz -O jdk.tar.gz
+tar -xzf jdk.tar.gz -C /opt/
+mv /opt/jdk-23 /opt/jdk
diff --git a/src/delombok/lombok/delombok/DocCommentIntegrator.java b/src/delombok/lombok/delombok/DocCommentIntegrator.java
@@ -137,7 +137,7 @@ static void attach(final JCTree node, String docCommentContent, final int pos, O
 				}
 				
 				@Override public CommentStyle getStyle() {
-					return CommentStyle.JAVADOC;
+					return (CommentStyle) Javac.getCommentStyle();
 				}
 				
 				@Override public boolean isDeprecated() {
diff --git a/src/utils/lombok/javac/Javac.java b/src/utils/lombok/javac/Javac.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2019 The Project Lombok Authors.
+ * Copyright (C) 2009-2024 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -43,6 +43,7 @@
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.main.JavaCompiler;
 import com.sun.tools.javac.parser.Tokens.Comment;
+import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
 import com.sun.tools.javac.tree.DocCommentTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCAnnotation;
@@ -330,6 +331,10 @@ public static void setDocComment(JCCompilationUnit cu, JCTree node, String javad
 		}
 	}
 	
+	public static Object getCommentStyle() {
+		return JavadocOps_8.COMMENT_STYLE;
+	}
+	
 	private static class JavadocOps_8 {
 		static String getJavadoc(Object dc, JCTree node) {
 			DocCommentTable dct = (DocCommentTable) dc;
@@ -350,6 +355,15 @@ static void setJavadoc(Object dc, JCTree node, String javadoc) {
 			dct.putComment(node, newCmt);
 		}
 		
+		private static final CommentStyle COMMENT_STYLE = getCommentStyle();
+		private static CommentStyle getCommentStyle() {
+			try {
+				return CommentStyle.valueOf("JAVADOC");
+			} catch (IllegalArgumentException e) {
+				return CommentStyle.valueOf("JAVADOC_BLOCK");
+			}
+		}
+		
 		private static Comment createJavadocComment(final String text, final JCTree field) {
 			return new Comment() {
 				@Override public String getText() {
@@ -361,7 +375,7 @@ private static Comment createJavadocComment(final String text, final JCTree fiel
 				}
 				
 				@Override public CommentStyle getStyle() {
-					return CommentStyle.JAVADOC;
+					return COMMENT_STYLE;
 				}
 				
 				@Override public boolean isDeprecated() {
diff --git a/test/pretty/resource/after/Javadoc.java b/test/pretty/resource/after/Javadoc.java
@@ -0,0 +1,17 @@
+/**
+ * Block comment
+ */
+class BlockComment {
+	/**
+	 * Method
+	 */
+	private void test() {
+	}
+}
+/// Markdown
+/// Comment
+class MarkdownComment {
+	/// Method
+	private void test() {
+	}
+}
diff --git a/test/pretty/resource/before/Javadoc.java b/test/pretty/resource/before/Javadoc.java
@@ -0,0 +1,19 @@
+/**
+ * Block comment
+ */
+class BlockComment {
+	
+	/**
+	 * Method
+	 */
+	private void test() {}
+}
+
+/// Markdown
+/// Comment
+class MarkdownComment {
+	
+	/// Method
+	private void test() {}
+	
+}
