merge from idea markdown doc support

Author: VISTALL

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java

@@ -3052,7 +3052,8 @@ public static HighlightInfo checkUnclosedComment(PsiComment comment) {
         if (!(comment instanceof PsiDocComment) && comment.getTokenType() != JavaTokenType.C_STYLE_COMMENT) {
             return null;
         }
-        if (!comment.getText().endsWith("*/")) {
+        String text = comment.getText();
+        if (text.startsWith("/*") && !text.endsWith("*/")) {
             int start = comment.getTextRange().getEndOffset() - 1;
             int end = start + 1;
             return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)

java-language-api/src/main/java/com/intellij/java/language/JavaFeature.java

@@ -115,6 +115,12 @@ public LanguageLevel getStandardLevel() {
     //JEP 507
     PRIMITIVE_TYPES_IN_PATTERNS(LanguageLevel.JDK_23_PREVIEW, "feature.primitive.types.in.patterns"),
 
+    /**
+     * Usually, this type of comments is shown as Javadoc despite language level.
+     * This option can be used only to adjust behavior for cases with conflicts between different types of comments (markdown and old-style)
+     */
+    MARKDOWN_COMMENT(LanguageLevel.JDK_23, "feature.markdown.comment"),
+
     //JEP 494
     PACKAGE_IMPORTS_SHADOW_MODULE_IMPORTS(LanguageLevel.JDK_24_PREVIEW, "feature.package.import.shadow.module.import") {
         @Override

java-language-api/src/main/java/com/intellij/java/language/lexer/DocCommentTokenTypes.java

@@ -58,4 +58,16 @@ public interface DocCommentTokenTypes {
   IElementType badCharacter();
 
   IElementType commentLeadingAsterisks();
+
+  default IElementType tagValueQuote() {
+    return commentData();
+  }
+
+  default IElementType tagValueColon() {
+    return commentData();
+  }
+
+  default IElementType tagValueSlash() {
+    return commentData();
+  }
 }

java-language-api/src/main/java/com/intellij/java/language/lexer/JavaDocCommentTokenTypes.java

@@ -0,0 +1,42 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.java.language.lexer;
+
+import consulo.language.ast.IElementType;
+
+/**
+ * Describes JDoc comment specific to the Java Plugin (not part of the core-api)
+ */
+public interface JavaDocCommentTokenTypes extends DocCommentTokenTypes {
+
+  default IElementType codeFence() {
+    return commentData();
+  }
+
+  default IElementType rightBracket() {
+    return commentData();
+  }
+
+  default IElementType leftBracket() {
+    return commentData();
+  }
+
+  default IElementType leftParenthesis() {
+    return commentData();
+  }
+
+  default IElementType rightParenthesis() {
+    return commentData();
+  }
+
+  default IElementType sharp() {
+    return commentData();
+  }
+
+  default IElementType inlineCodeFence() {
+    return commentData();
+  }
+
+  default IElementType comma() {
+    return commentData();
+  }
+}

java-language-api/src/main/java/com/intellij/java/language/lexer/JavaDocTokenTypes.java

@@ -22,8 +22,8 @@
 /**
  * @author yole
  */
-public class JavaDocTokenTypes implements DocCommentTokenTypes {
-  public static final DocCommentTokenTypes INSTANCE = new JavaDocTokenTypes();
+public final class JavaDocTokenTypes implements JavaDocCommentTokenTypes {
+  public static final JavaDocCommentTokenTypes INSTANCE = new JavaDocTokenTypes();
   private final TokenSet mySpaceCommentsSet = TokenSet.create(JavaDocTokenType.DOC_SPACE, JavaDocTokenType.DOC_COMMENT_DATA);
 
   private JavaDocTokenTypes() { }
@@ -68,11 +68,26 @@ public IElementType tagValueRParen() {
     return JavaDocTokenType.DOC_TAG_VALUE_RPAREN;
   }
 
+  @Override
+  public IElementType tagValueQuote() {
+    return JavaDocTokenType.DOC_TAG_VALUE_QUOTE;
+  }
+
+  @Override
+  public IElementType tagValueColon() {
+    return JavaDocTokenType.DOC_TAG_VALUE_COLON;
+  }
+
   @Override
   public IElementType tagValueSharp() {
     return JavaDocTokenType.DOC_TAG_VALUE_SHARP_TOKEN;
   }
 
+  @Override
+  public IElementType tagValueSlash() {
+    return JavaDocTokenType.DOC_TAG_VALUE_SLASH;
+  }
+
   @Override
   public IElementType tagValueComma() {
     return JavaDocTokenType.DOC_TAG_VALUE_COMMA;
@@ -112,4 +127,44 @@ public IElementType badCharacter() {
   public IElementType commentLeadingAsterisks() {
     return JavaDocTokenType.DOC_COMMENT_LEADING_ASTERISKS;
   }
+
+  @Override
+  public IElementType codeFence() {
+    return JavaDocTokenType.DOC_CODE_FENCE;
+  }
+
+  @Override
+  public IElementType rightBracket() {
+    return JavaDocTokenType.DOC_RBRACKET;
+  }
+
+  @Override
+  public IElementType leftBracket() {
+    return JavaDocTokenType.DOC_LBRACKET;
+  }
+
+  @Override
+  public IElementType leftParenthesis() {
+    return JavaDocTokenType.DOC_LPAREN;
+  }
+
+  @Override
+  public IElementType rightParenthesis() {
+    return JavaDocTokenType.DOC_RPAREN;
+  }
+
+  @Override
+  public IElementType sharp() {
+    return JavaDocTokenType.DOC_SHARP;
+  }
+
+  @Override
+  public IElementType inlineCodeFence() {
+    return JavaDocTokenType.DOC_INLINE_CODE_FENCE;
+  }
+
+  @Override
+  public IElementType comma() {
+    return JavaDocTokenType.DOC_COMMA;
+  }
 }