MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

decouple PsiAnnotationImpl from AnnotationUtil

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-09-23 19:12:33 +02:00
parent 3bbe98b435
commit d0d3d7b271
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
+1 -2
View File
@@ -15,7 +15,6 @@
*/
package com.intellij.codeInsight.daemon.impl.analysis;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.CodeInsightUtilBase;
import com.intellij.codeInsight.daemon.JavaErrorMessages;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
@@ -312,7 +311,7 @@ public class AnnotationsHighlightUtil {
if (nameRef == null) return null;
PsiElement resolved = nameRef.resolve();
if (!(resolved instanceof PsiClass) ||
!AnnotationUtil.TARGET_ANNOTATION_FQ_NAME.equals(((PsiClass) resolved).getQualifiedName())) return null;
!CommonClassNames.TARGET_ANNOTATION_FQ_NAME.equals(((PsiClass) resolved).getQualifiedName())) return null;
PsiNameValuePair[] attributes = annotation.getParameterList().getAttributes();
if (attributes.length < 1) return null;
java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java
+1 -2
View File
@@ -15,7 +15,6 @@
*/
package com.intellij.psi.impl.source.tree.java;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
@@ -151,7 +150,7 @@ public class PsiAnnotationImpl extends JavaStubPsiElement<PsiAnnotationStub> imp
return !strict;
}
PsiClass annotationType = (PsiClass)resolved;
PsiAnnotation target = annotationType.getModifierList().findAnnotation(AnnotationUtil.TARGET_ANNOTATION_FQ_NAME);
PsiAnnotation target = annotationType.getModifierList().findAnnotation(CommonClassNames.TARGET_ANNOTATION_FQ_NAME);
if (target == null) {
//todo hack: ambiguity in spec
return !strict;
java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java
-1
View File
@@ -67,7 +67,6 @@ public class AnnotationUtil {
@NonNls private static final String[] SIMPLE_NAMES =
{NOT_NULL_SIMPLE_NAME, NULLABLE_SIMPLE_NAME, NON_NLS_SIMPLE_NAME, PROPERTY_KEY_SIMPLE_NAME, TEST_ONLY_SIMPLE_NAME,
"Language", "Identifier", "Pattern", "PrintFormat", "RegExp", "Subst"};
public static final String TARGET_ANNOTATION_FQ_NAME = "java.lang.annotation.Target";
static {
ALL_ANNOTATIONS = new HashSet<String>(2);
java/openapi/src/com/intellij/psi/CommonClassNames.java
+1
View File
@@ -84,4 +84,5 @@ public interface CommonClassNames {
@NonNls String JAVA_UTIL_ARRAY_LIST = "java.util.ArrayList";
@NonNls String JAVA_LANG_INVOKE_MH_POLYMORPHIC = "java.lang.invoke.MethodHandle.PolymorphicSignature";
String TARGET_ANNOTATION_FQ_NAME = "java.lang.annotation.Target";
}