From b046fcec9273ffc6e94c5520ade0f52691e5180f Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 30 May 2013 11:58:59 +0400 Subject: [PATCH] ignore whitespaces when gathering inlined tags data elements (IDEA-107812) --- .../psi/impl/source/javadoc/PsiInlineDocTagImpl.java | 2 +- java/java-tests/testData/codeInsight/javadocIG/literal.html | 2 ++ java/java-tests/testData/codeInsight/javadocIG/literal.java | 6 ++++++ .../codeInsight/javadoc/JavaDocInfoGeneratorTest.java | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 java/java-tests/testData/codeInsight/javadocIG/literal.html create mode 100644 java/java-tests/testData/codeInsight/javadocIG/literal.java diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiInlineDocTagImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiInlineDocTagImpl.java index 38466a5f6cb1..1adf3a5a700a 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiInlineDocTagImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiInlineDocTagImpl.java @@ -38,7 +38,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); private static final TokenSet VALUE_BIT_SET = TokenSet.orSet(TAG_VALUE_BIT_SET, TokenSet.create( - JAVA_CODE_REFERENCE, DOC_TAG_VALUE_TOKEN, DOC_COMMENT_DATA, DOC_INLINE_TAG, DOC_REFERENCE_HOLDER, WHITE_SPACE, DOC_COMMENT_BAD_CHARACTER)); + JAVA_CODE_REFERENCE, DOC_TAG_VALUE_TOKEN, DOC_COMMENT_DATA, DOC_INLINE_TAG, DOC_REFERENCE_HOLDER, DOC_COMMENT_BAD_CHARACTER)); public PsiInlineDocTagImpl() { super(DOC_INLINE_TAG); diff --git a/java/java-tests/testData/codeInsight/javadocIG/literal.html b/java/java-tests/testData/codeInsight/javadocIG/literal.html new file mode 100644 index 000000000000..bc3d26589fed --- /dev/null +++ b/java/java-tests/testData/codeInsight/javadocIG/literal.html @@ -0,0 +1,2 @@ + Foo
int foo
+ foo<> \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/javadocIG/literal.java b/java/java-tests/testData/codeInsight/javadocIG/literal.java new file mode 100644 index 000000000000..a6413f50fef7 --- /dev/null +++ b/java/java-tests/testData/codeInsight/javadocIG/literal.java @@ -0,0 +1,6 @@ +class Foo { + /** + * foo{@literal <>} + */ + int foo; +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java index 9fefc23b0287..28644e96790b 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java @@ -64,6 +64,10 @@ public class JavaDocInfoGeneratorTest extends CodeInsightTestCase { doTestField(); } + public void testLiteral() throws Exception { + doTestField(); + } + public void testEnumConstantOrdinal() throws Exception { PsiClass psiClass = getTestClass(); PsiField field = psiClass.getFields() [0];