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

reverted to getResolveScope() because of possibility of two unrelated JDKs

Browse Source
This commit is contained in:
Alexey Kudravtsev
2016-06-02 14:23:09 +03:00
parent 04156f7b31
commit 90a5eafcfc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java
+6 -5
View File
@@ -77,11 +77,11 @@ public class InheritanceImplUtil {
String baseQName = baseClass.getQualifiedName();
if (baseQName == null) return false;
if (CommonClassNames.JAVA_LANG_ENUM.equals(baseQName)) {
return candidateClass.isEnum();
if (CommonClassNames.JAVA_LANG_ENUM.equals(baseQName) && candidateClass.isEnum()) {
return facade.findClass(baseQName, candidateClass.getResolveScope()) != null;
}
if (CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION.equals(baseQName)) {
return candidateClass.isAnnotationType();
if (CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION.equals(baseQName) && candidateClass.isAnnotationType()) {
return facade.findClass(baseQName, candidateClass.getResolveScope()) != null;
}
boolean isCandidateInterface = candidateClass.isInterface();
@@ -119,7 +119,8 @@ public class InheritanceImplUtil {
if (referenceElements.length != 0) {
GlobalSearchScope scope = extList.getResolveScope();
for (PsiJavaCodeReferenceElement ref : referenceElements) {
if (Comparing.equal(PsiNameHelper.getQualifiedClassName(ref.getQualifiedName(), false), baseQName) && facade.findClass(baseQName, scope) != null)
if (Comparing.equal(PsiNameHelper.getQualifiedClassName(ref.getQualifiedName(), false), baseQName)
&& facade.findClass(baseQName, scope) != null)
return true;
}
}