[#3722] Support new JDK23 CommentStyle

.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

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

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

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

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