From 8d3c33eb8ca89240c32d44c94022893e4ce14e82 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 15 Sep 2016 20:52:14 +0300
Subject: [PATCH] Revert: annotations: check error elements after annotation to
 rise annotation not expected here instead of some unpredictable warnings
 (IDEA-160106) (d4e7271498161336f870585e2393348552d2bd53)

---
 .../intellij/codeInsight/AnnotationTargetUtil.java   |  3 ---
 .../src/com/intellij/psi/impl/PsiClassImplUtil.java  |  4 ++--
 .../annotations/annotationOverIncompleteCode.java    | 12 ------------
 .../daemon/AnnotationsHighlightingTest.java          |  1 -
 4 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/annotations/annotationOverIncompleteCode.java

diff --git a/java/java-psi-api/src/com/intellij/codeInsight/AnnotationTargetUtil.java b/java/java-psi-api/src/com/intellij/codeInsight/AnnotationTargetUtil.java
index 7393be47a8e7..ba4f28077349 100644
--- a/java/java-psi-api/src/com/intellij/codeInsight/AnnotationTargetUtil.java
+++ b/java/java-psi-api/src/com/intellij/codeInsight/AnnotationTargetUtil.java
@@ -61,9 +61,6 @@ public class AnnotationTargetUtil {
     }
 
     if (owner instanceof PsiModifierList) {
-      if (((PsiModifierList)owner).getNextSibling() instanceof PsiErrorElement) {
-        return TargetType.EMPTY_ARRAY;
-      }
       PsiElement element = ((PsiModifierList)owner).getParent();
       if (element instanceof PsiPackageStatement) {
         return PACKAGE_TARGETS;
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
index da87c3a21abd..defa0a09a4bb 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
@@ -467,8 +467,8 @@ public class PsiClassImplUtil {
                                                     @NotNull LanguageLevel languageLevel,
                                                     boolean isRaw,
                                                     @NotNull GlobalSearchScope resolveScope) {
-    if (last instanceof PsiTypeParameterList || last instanceof PsiModifierList && !(last.getNextSibling() instanceof PsiErrorElement)) {
-      return true;
+    if (last instanceof PsiTypeParameterList || last instanceof PsiModifierList) {
+      return true; //TypeParameterList and ModifierList do not see our declarations
     }
     if (visited != null && visited.contains(aClass)) return true;
 
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/annotations/annotationOverIncompleteCode.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/annotations/annotationOverIncompleteCode.java
deleted file mode 100644
index 2e0bf6272dc7..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/annotations/annotationOverIncompleteCode.java
+++ /dev/null
@@ -1,12 +0,0 @@
-class Dummy {
-
-  public @interface Debug {
-    String value() default "[no comment]";
-  }
-
-  private static final class Constants {
-    private static final String INPUT = "Input";
-  }
-
-  <error descr="Annotations are not allowed here">@Dummy.Debug(Constants.INPUT)</error><EOLError descr="Identifier or type expected"></EOLError>
-}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/AnnotationsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/AnnotationsHighlightingTest.java
index 6cf7c1c6d20a..c0cf9a49f3e0 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/AnnotationsHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/AnnotationsHighlightingTest.java
@@ -49,7 +49,6 @@ public class AnnotationsHighlightingTest extends LightDaemonAnalyzerTestCase {
   public void testRepeatable() { doTest8(); }
   public void testEnumValues() { doTest8(); }
   public void testReceiverParameters() { doTest8(); }
-  public void testAnnotationOverIncompleteCode() { doTest(); }
 
   private void doTest() {
     setLanguageLevel(LanguageLevel.JDK_1_7);