Merge pull request #157 from unv-unv/ep-name-general-refactoring-7

Refactoring and localizing users of EP_NAME (part 7)

Author: VISTALL

java-analysis-api/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.analysis.JavaAnalysisLocalize.yaml

@@ -1,29 +1,5 @@
 add.explicit.type.arguments:
   text: Add explicit type arguments
-annotation.target.ANNOTATION_TYPE:
-  text: annotation type
-annotation.target.CONSTRUCTOR:
-  text: constructor
-annotation.target.FIELD:
-  text: field
-annotation.target.LOCAL_VARIABLE:
-  text: local variable
-annotation.target.METHOD:
-  text: method
-annotation.target.MODULE:
-  text: module
-annotation.target.PACKAGE:
-  text: package
-annotation.target.PARAMETER:
-  text: parameter
-annotation.target.RECORD_COMPONENT:
-  text: record component
-annotation.target.TYPE:
-  text: type
-annotation.target.TYPE_PARAMETER:
-  text: type parameter
-annotation.target.TYPE_USE:
-  text: type use
 change.type.arguments:
   text: Change type arguments
 change.type.arguments.to.0:

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java

@@ -271,10 +271,9 @@ else if (isAnnotationRepeatedTwice(owner, annotationType.getQualifiedName())) {
                 PsiAnnotation.TargetType[] targets = AnnotationTargetUtil.getTargetsForLocation(owner);
                 PsiAnnotation.TargetType applicable = AnnotationTargetUtil.findAnnotationTarget(container, targets);
                 if (applicable == null) {
-                    String target = JavaErrorBundle.message("annotation.target." + targets[0]);
                     return annotationError(
                         annotationToCheck,
-                        JavaErrorLocalize.annotationContainerNotApplicable(container.getName(), target)
+                        JavaErrorLocalize.annotationContainerNotApplicable(container.getName(), targets[0].getPresentableText())
                     );
                 }
             }
@@ -446,8 +445,7 @@ public static HighlightInfo checkApplicability(@Nonnull PsiAnnotation annotation
         }
 
         if (applicable == null) {
-            String target = JavaErrorBundle.message("annotation.target." + targets[0]);
-            return annotationError(annotation, JavaErrorLocalize.annotationNotApplicable(nameRef.getText(), target));
+            return annotationError(annotation, JavaErrorLocalize.annotationNotApplicable(nameRef.getText(), targets[0].getPresentableText()));
         }
 
         if (applicable == PsiAnnotation.TargetType.TYPE_USE) {

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java

@@ -414,6 +414,7 @@ else if (referenceElements.length != 0 && element != referenceElements[0]
         return null;
     }
 
+    @RequiredReadAction
     public static HighlightInfo checkInterfaceMultipleInheritance(PsiClass aClass) {
         PsiClassType[] types = aClass.getSuperTypes();
         if (types.length < 2) {
@@ -1587,6 +1588,7 @@ public static HighlightInfo checkGenericCannotExtendException(PsiReferenceList l
         return null;
     }
 
+    @RequiredReadAction
     public static HighlightInfo checkEnumMustNotBeLocal(PsiClass aClass) {
         if (!aClass.isEnum()) {
             return null;
@@ -1602,6 +1604,7 @@ public static HighlightInfo checkEnumMustNotBeLocal(PsiClass aClass) {
         return null;
     }
 
+    @RequiredReadAction
     public static HighlightInfo checkEnumWithoutConstantsCantHaveAbstractMethods(PsiClass aClass) {
         if (!aClass.isEnum()) {
             return null;
@@ -1787,6 +1790,7 @@ public static HighlightInfo checkInferredIntersections(PsiSubstitutor substituto
         return null;
     }
 
+    @RequiredReadAction
     public static HighlightInfo areSupersAccessible(@Nonnull PsiClass aClass) {
         return areSupersAccessible(aClass, aClass.getResolveScope(), HighlightNamesUtil.getClassDeclarationTextRange(aClass), true);
     }