IDEA-68178 Completions does not complete class names in java annotations

java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java

@@ -41,6 +41,7 @@ import com.intellij.psi.filters.element.ModifierFilter;
 import com.intellij.psi.filters.getters.ExpectedTypesGetter;
 import com.intellij.psi.filters.types.AssignableFromFilter;
 import com.intellij.psi.impl.source.tree.ElementType;
+import com.intellij.psi.impl.source.tree.JavaElementType;
 import com.intellij.psi.scope.ElementClassFilter;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
@@ -50,7 +51,10 @@ import com.intellij.util.ProcessingContext;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 import static com.intellij.patterns.PsiJavaPatterns.*;
 
@@ -94,7 +98,7 @@ public class JavaCompletionContributor extends CompletionContributor {
     or(psiElement().afterLeaf(psiElement().withText("|").withParent(PsiTypeElement.class).withSuperParent(2, PsiCatchSection.class)),
        psiElement().afterLeaf(psiElement().withText("|").withParent(PsiTypeElement.class).withSuperParent(2, PsiParameter.class).withSuperParent(3, PsiCatchSection.class)));
   static final ElementPattern<PsiElement> INSIDE_METHOD_THROWS_CLAUSE =
-    psiElement().afterLeaf(PsiKeyword.THROWS, ",").inside(PsiMethod.class).andNot(psiElement().inside(PsiCodeBlock.class)).andNot(psiElement().inside(PsiParameterList.class));
+    psiElement().afterLeaf(PsiKeyword.THROWS, ",").inside(psiElement(JavaElementType.THROWS_LIST));
   static final ElementPattern<PsiElement> IN_RESOURCE_TYPE =
     psiElement().withParent(psiElement(PsiJavaCodeReferenceElement.class).
       withParent(psiElement(PsiTypeElement.class).

java/java-impl/src/com/intellij/psi/filters/getters/ClassLiteralGetter.java

@@ -45,21 +45,22 @@ public class ClassLiteralGetter {
     PsiType classParameter = PsiUtil.substituteTypeParameter(parameters.getExpectedType(), CommonClassNames.JAVA_LANG_CLASS, 0, false);
 
     boolean addInheritors = false;
+    PsiElement position = parameters.getPosition();
     if (classParameter instanceof PsiWildcardType) {
       final PsiWildcardType wildcardType = (PsiWildcardType)classParameter;
       classParameter = wildcardType.getBound();
       addInheritors = wildcardType.isExtends() && classParameter instanceof PsiClassType;
+    } else if (!matcher.getPrefix().isEmpty()) {
+      addInheritors = true;
+      classParameter = PsiType.getJavaLangObject(position.getManager(), position.getResolveScope());
     }
-    if (classParameter == null) {
-      return;
+    if (classParameter != null) {
+      PsiFile file = position.getContainingFile();
+      addClassLiteralLookupElement(classParameter, result, file);
+      if (addInheritors) {
+        addInheritorClassLiterals(file, shortNameCondition, classParameter, result, matcher);
+      }
     }
-
-    PsiFile file = parameters.getPosition().getContainingFile();
-    addClassLiteralLookupElement(classParameter, result, file);
-    if (addInheritors) {
-      addInheritorClassLiterals(file, shortNameCondition, classParameter, result, matcher);
-    }
-
   }
 
   private static void addInheritorClassLiterals(PsiFile context,

java/java-tests/testData/codeInsight/completion/normal/ClassLiteralInArrayAnnoInitializer.java

@@ -0,0 +1,10 @@
+@interface TestFor {
+  Class[] testForClass();
+}
+
+class Foo {
+  @TestFor(testForClass = { Aaaaaa<caret> } )
+  public void foo22() {}
+}
+
+class Aaaaaaaaaaaaaaaaaaaaa {}

java/java-tests/testData/codeInsight/completion/normal/ClassLiteralInArrayAnnoInitializer2.java

@@ -0,0 +1,10 @@
+@interface TestFor {
+  Class[] testForClass();
+}
+
+class Foo {
+  @TestFor(testForClass = { Object.class, Aaaaaa<caret> } )
+  public void foo22() {}
+}
+
+class Aaaaaaaaaaaaaaaaaaaaa {}

java/java-tests/testData/codeInsight/completion/normal/ClassLiteralInArrayAnnoInitializer2_after.java

@@ -0,0 +1,10 @@
+@interface TestFor {
+  Class[] testForClass();
+}
+
+class Foo {
+  @TestFor(testForClass = { Object.class, Aaaaaaaaaaaaaaaaaaaaa<caret> } )
+  public void foo22() {}
+}
+
+class Aaaaaaaaaaaaaaaaaaaaa {}

java/java-tests/testData/codeInsight/completion/normal/ClassLiteralInArrayAnnoInitializer_after.java

@@ -0,0 +1,10 @@
+@interface TestFor {
+  Class[] testForClass();
+}
+
+class Foo {
+  @TestFor(testForClass = { Aaaaaaaaaaaaaaaaaaaaa<caret> } )
+  public void foo22() {}
+}
+
+class Aaaaaaaaaaaaaaaaaaaaa {}

java/java-tests/testData/codeInsight/completion/smartType/ClassLiteralInArrayAnnoInitializer-out.java

@@ -0,0 +1,10 @@
+@interface TestFor {
+  Class[] testForClass();
+}
+
+class Foo {
+  @TestFor(testForClass = { Aaaaaaaaaaaaaaaaaaaaa.class<caret> } )
+  public void foo22() {}
+}
+
+class Aaaaaaaaaaaaaaaaaaaaa {}

java/java-tests/testData/codeInsight/completion/smartType/ClassLiteralInArrayAnnoInitializer.java

@@ -0,0 +1,10 @@
+@interface TestFor {
+  Class[] testForClass();
+}
+
+class Foo {
+  @TestFor(testForClass = { Aaaaaa<caret> } )
+  public void foo22() {}
+}
+
+class Aaaaaaaaaaaaaaaaaaaaa {}

java/java-tests/testData/codeInsight/completion/smartType/ClassLiteralInArrayAnnoInitializer2-out.java

@@ -0,0 +1,12 @@
+import java.lang.Object;
+
+@interface TestFor {
+  Class[] testForClass();
+}
+
+class Foo {
+  @TestFor(testForClass = {Object.class, Aaaaaaaaaaaaaaaaaaaaa.class<caret> } )
+  public void foo22() {}
+}
+
+class Aaaaaaaaaaaaaaaaaaaaa {}

java/java-tests/testData/codeInsight/completion/smartType/ClassLiteralInArrayAnnoInitializer2.java

@@ -0,0 +1,12 @@
+import java.lang.Object;
+
+@interface TestFor {
+  Class[] testForClass();
+}
+
+class Foo {
+  @TestFor(testForClass = {Object.class, Aaaaaa<caret> } )
+  public void foo22() {}
+}
+
+class Aaaaaaaaaaaaaaaaaaaaa {}

java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy

@@ -176,6 +176,9 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
     assertTrue("Exception not found", Arrays.binarySearch(myItems, "xxx") > 0);
   }
 
+  public void testClassLiteralInArrayAnnoInitializer() throws Throwable { doTest(); }
+  public void testClassLiteralInArrayAnnoInitializer2() throws Throwable { doTest(); }
+
   public void testReferenceParameters() throws Exception {
     configureByFile("ReferenceParameters.java");
     assertNotNull(myItems);

java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java

@@ -801,6 +801,8 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase {
   }
 
   public void testCastWith2TypeParameters() throws Throwable { doTest(); }
+  public void testClassLiteralInArrayAnnoInitializer() throws Throwable { doTest(); }
+  public void testClassLiteralInArrayAnnoInitializer2() throws Throwable { doTest(); }
 
   public void testAnnotation() throws Exception {
     doTest();