MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix(JavaDoc): Html code support in tags

Browse Source 
GitOrigin-RevId: b4d6a52b9e5a8f292a41b5b94e93b6bfd16364b9
This commit is contained in:
Mathias Boulay
2024-08-29 16:55:53 +00:00
committed by intellij-monorepo-bot
parent f4ebbc6873
commit 2bd10fba65
5 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocTagImpl.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class PsiDocTagImpl extends CompositePsiElement implements PsiDocTag, Con
private static final TokenSet TAG_VALUE_BIT_SET = TokenSet.create(
DOC_TAG_VALUE_ELEMENT, DOC_METHOD_OR_FIELD_REF, DOC_PARAMETER_REF);
private static final TokenSet VALUE_BIT_SET = TokenSet.orSet(TAG_VALUE_BIT_SET, TokenSet.create(
DOC_TAG_VALUE_TOKEN, JAVA_CODE_REFERENCE, DOC_COMMENT_DATA, DOC_INLINE_TAG, DOC_REFERENCE_HOLDER));
DOC_TAG_VALUE_TOKEN, JAVA_CODE_REFERENCE, DOC_COMMENT_DATA, DOC_INLINE_TAG, DOC_REFERENCE_HOLDER, DOC_SHARP, DOC_LBRACKET, DOC_RBRACKET, DOC_LPAREN, DOC_RPAREN));
public PsiDocTagImpl() {
super(DOC_TAG);
java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiInlineDocTagImpl.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class PsiInlineDocTagImpl extends CompositePsiElement implements PsiInlin
private static final TokenSet TAG_VALUE_BIT_SET = TokenSet.create(DOC_TAG_VALUE_ELEMENT, DOC_METHOD_OR_FIELD_REF);
static final TokenSet VALUE_BIT_SET = TokenSet.orSet(TAG_VALUE_BIT_SET, TokenSet.create(
JAVA_CODE_REFERENCE, DOC_TAG_VALUE_TOKEN, WHITE_SPACE, DOC_COMMENT_DATA, DOC_INLINE_TAG, DOC_REFERENCE_HOLDER, DOC_COMMENT_BAD_CHARACTER,
DOC_SNIPPET_TAG_VALUE));
DOC_SNIPPET_TAG_VALUE, DOC_SHARP, DOC_LBRACKET, DOC_RBRACKET, DOC_LPAREN, DOC_RPAREN));
public PsiInlineDocTagImpl() {
super(DOC_INLINE_TAG);
java/java-tests/testData/codeInsight/javadocIG/htmlCodeInMarkdown.html
+1
View File
@@ -0,0 +1 @@
<html><head><base href="placeholder"></head><body><div class="bottom"><icon src="AllIcons.Nodes.Class">&nbsp;<a href="psi_element://C"><code><span style="color:#000000;">C</span></code></a></div><div class='definition'><pre><span style="color:#000080;font-weight:bold;">void</span>&nbsp;<span style="color:#000000;">foo</span><span style="">(</span><br> <a href="psi_element://java.lang.Integer"><code><span style="color:#000000;">Integer</span></code></a>&nbsp;<span style="color:#000000;">i</span><br><span style="">)</span></pre></div><div class='content'><p>@ ℀ №</p></div><table class='sections'><tr><td valign='top' class='section'><p>Params:</td><td valign='top'><code><span style="color:#000000;">i</span></code> &ndash; @ ℀ №</td></table>
java/java-tests/testData/codeInsight/javadocIG/htmlCodeInMarkdown.java
+9
View File
@@ -0,0 +1,9 @@
class C {
/// &#64; &#8448; &#8470;
/// @param i &#64; &#8448; &#8470;
void foo(Integer i) {
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
+3
View File
@@ -200,6 +200,9 @@ public class JavaDocInfoGeneratorTest extends JavaCodeInsightTestCase {
public void testMarkdownJepExample(){
doTestMethod();
}
public void testHtmlCodeInMarkdown() {
doTestMethod();
}
public void testRepeatableAnnotations() {
useJava8();