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

isJavaLangObject->hasObjectQualifiedName

Browse Source
This commit is contained in:
peter
2015-05-15 17:25:39 +02:00
parent 83aca88d36
commit 84ccf388f1
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/JavaClassSupersImpl.java
+1 -5
View File
@@ -36,7 +36,7 @@ public class JavaClassSupersImpl extends JavaClassSupers {
@NotNull PsiClass derivedClass,
@NotNull GlobalSearchScope scope,
@NotNull PsiSubstitutor derivedSubstitutor) {
if (isJavaLangObject(superClass)) return PsiSubstitutor.EMPTY;
if (InheritanceImplUtil.hasObjectQualifiedName(superClass)) return PsiSubstitutor.EMPTY;
return derivedClass instanceof PsiTypeParameter
? processTypeParameter((PsiTypeParameter)derivedClass, scope, superClass, ContainerUtil.<PsiTypeParameter>newTroveSet(), derivedSubstitutor)
@@ -55,10 +55,6 @@ public class JavaClassSupersImpl extends JavaClassSupers {
return composeSubstitutors(derivedSubstitutor, substitutor);
}
static boolean isJavaLangObject(PsiClass psiClass) {
return CommonClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName());
}
@NotNull
static PsiSubstitutor createRawSubstitutor(@NotNull PsiClass superClass) {
return JavaPsiFacade.getElementFactory(superClass.getProject()).createRawSubstitutor(superClass);
java/java-psi-impl/src/com/intellij/psi/impl/ScopedClassHierarchy.java
+1 -1
View File
@@ -59,7 +59,7 @@ class ScopedClassHierarchy {
PsiClassType.ClassResolveResult resolveResult = ((PsiClassType)type).resolveGenerics();
PsiClass psiClass = resolveResult.getElement();
if (psiClass == null || JavaClassSupersImpl.isJavaLangObject(psiClass) || mySupersWithSubstitutors.containsKey(psiClass)) continue;
if (psiClass == null || InheritanceImplUtil.hasObjectQualifiedName(psiClass) || mySupersWithSubstitutors.containsKey(psiClass)) continue;
mySupersWithSubstitutors.put(psiClass, resolveResult);