From 9e37ec42f9f52360f30735bc64c5cad6556bce59 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Wed, 20 Dec 2017 16:14:29 +0300 Subject: [PATCH] IDEA-183660 Quick doc on a link --- .../intellij/codeInsight/JavaTargetElementEvaluator.java | 3 +-- .../testData/codeInsight/javadocIG/paramInJavadoc.html | 1 + .../testData/codeInsight/javadocIG/paramInJavadoc.java | 6 ++++++ .../java/codeInsight/javadoc/JavaDocInfoGeneratorTest.java | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 java/java-tests/testData/codeInsight/javadocIG/paramInJavadoc.html create mode 100644 java/java-tests/testData/codeInsight/javadocIG/paramInJavadoc.java diff --git a/java/java-impl/src/com/intellij/codeInsight/JavaTargetElementEvaluator.java b/java/java-impl/src/com/intellij/codeInsight/JavaTargetElementEvaluator.java index ab11f1f74398..2c26949700fc 100644 --- a/java/java-impl/src/com/intellij/codeInsight/JavaTargetElementEvaluator.java +++ b/java/java-impl/src/com/intellij/codeInsight/JavaTargetElementEvaluator.java @@ -11,7 +11,6 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.util.Computable; import com.intellij.psi.*; import com.intellij.psi.javadoc.PsiDocTag; -import com.intellij.psi.javadoc.PsiDocToken; import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.searches.ClassInheritorsSearch; @@ -104,8 +103,8 @@ public class JavaTargetElementEvaluator extends TargetElementEvaluatorEx2 implem @Override @NotNull public ThreeState isAcceptableReferencedElement(@NotNull final PsiElement element, final PsiElement referenceOrReferencedElement) { + if (referenceOrReferencedElement instanceof SyntheticElement) return ThreeState.NO; if (isEnumConstantReference(element, referenceOrReferencedElement)) return ThreeState.NO; - if (element instanceof PsiDocToken) return ThreeState.NO; return super.isAcceptableReferencedElement(element, referenceOrReferencedElement); } diff --git a/java/java-tests/testData/codeInsight/javadocIG/paramInJavadoc.html b/java/java-tests/testData/codeInsight/javadocIG/paramInJavadoc.html new file mode 100644 index 000000000000..c29283f41775 --- /dev/null +++ b/java/java-tests/testData/codeInsight/javadocIG/paramInJavadoc.html @@ -0,0 +1 @@ + 
int i
i - input \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/javadocIG/paramInJavadoc.java b/java/java-tests/testData/codeInsight/javadocIG/paramInJavadoc.java new file mode 100644 index 000000000000..9fc312d8ee7a --- /dev/null +++ b/java/java-tests/testData/codeInsight/javadocIG/paramInJavadoc.java @@ -0,0 +1,6 @@ +class C { + /** + * @param i input + */ + void m(int i) {} +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/JavaDocInfoGeneratorTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/JavaDocInfoGeneratorTest.java index aa615a680e0e..362352685e42 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/JavaDocInfoGeneratorTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/JavaDocInfoGeneratorTest.java @@ -409,6 +409,8 @@ public class JavaDocInfoGeneratorTest extends CodeInsightTestCase { public void testCaretAtLinkInJavadoc() throws Exception { doTestAtCaret(); } + public void testParamInJavadoc() throws Exception { doTestAtCaret(); } + private void doTestAtCaret() throws Exception { configureByFile(); String docInfo = JavaExternalDocumentationTest.getDocumentationText(myFile, myEditor.getCaretModel().getOffset());