IDEA-248001 Annotation parameter completion in generics doesn't work correctly

GitOrigin-RevId: e723f01752834d2545b3d26a46693436d35fb6fb

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
index 9600dded415114487e35544db42df4bf6ed29f98..624acf15e374b667e23ca1ea1ccc9324f0529a79 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
@@ -117,7 +117,7 @@ public class JavaCompletionContributor extends CompletionContributor implements
     if (JavaKeywordCompletion.isDeclarationStart(position) ||
         JavaKeywordCompletion.isInsideParameterList(position) ||
         isInsideAnnotationName(position) ||
-        psiElement().inside(PsiReferenceParameterList.class).accepts(position) ||
+        PsiTreeUtil.getParentOfType(position, PsiReferenceParameterList.class, false, PsiAnnotation.class) != null ||
         isDefinitelyVariableType(position)) {
       return new OrFilter(ElementClassFilter.CLASS, ElementClassFilter.PACKAGE);
     }

diff --git a/java/java-tests/testData/codeInsight/completion/normal/EnumInTypeAnnotation.java b/java/java-tests/testData/codeInsight/completion/normal/EnumInTypeAnnotation.java
new file mode 100644 (file)
index 0000000..ceddb1d
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/EnumInTypeAnnotation.java
@@ -0,0 +1,14 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.util.List;
+
+class A {
+  List<@Anno(value = Anno.MyEnum.f<caret>) String> l;
+
+}
+
+@Target(ElementType.TYPE_USE)
+@interface Anno {
+  enum MyEnum {foo,bar}
+  MyEnum value();
+}
\ No newline at end of file

diff --git a/java/java-tests/testData/codeInsight/completion/normal/EnumInTypeAnnotation_after.java b/java/java-tests/testData/codeInsight/completion/normal/EnumInTypeAnnotation_after.java
new file mode 100644 (file)
index 0000000..a6a8294
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/EnumInTypeAnnotation_after.java
@@ -0,0 +1,14 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.util.List;
+
+class A {
+  List<@Anno(value = Anno.MyEnum.foo<caret>) String> l;
+
+}
+
+@Target(ElementType.TYPE_USE)
+@interface Anno {
+  enum MyEnum {foo,bar}
+  MyEnum value();
+}
\ No newline at end of file

diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalCompletionTest.groovy
index e14ee12ebec4fd91c1f81290a6600a4752b4c765..937aebd9c166866b61df06c23fd64cc0b99b7ac6 100644 (file)
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalCompletionTest.groovy
@@ -328,6 +328,8 @@ class NormalCompletionTest extends NormalCompletionTestCase {
     checkResultByFile("Annotation4_after.java")
   }
 
+  void testEnumInTypeAnnotation() { doTest() }
+
   void testSecondAttribute() throws Exception {
     configureByFile("Annotation6.java")
     checkResultByFile("Annotation6_after.java")