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

some type parameters don't have superclasses (EA-23486)

Browse Source
This commit is contained in:
peter.gromov
2010-11-13 20:08:45 +03:00
parent a5b6b47793
commit 65ad79ba84
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
+9 -4
View File
@@ -197,7 +197,7 @@ public class ResolveUtil {
return type;
}
public static Map<String, PsiType> getAllSuperTypes(PsiType base, final Project project) {
public static Map<String, PsiType> getAllSuperTypes(@NotNull PsiType base, final Project project) {
final Map<String, Map<String, PsiType>> cache =
CachedValuesManager.getManager(project).getCachedValue(project, new CachedValueProvider<Map<String, Map<String, PsiType>>>() {
@Override
@@ -209,9 +209,14 @@ public class ResolveUtil {
final PsiClass cls = PsiUtil.resolveClassInType(base);
//noinspection ConstantConditions
String key = cls instanceof PsiTypeParameter
? cls.getName() + cls.getSuperClass().getName()
: TypeConversionUtil.erasure(base).getCanonicalText();
String key;
if (cls instanceof PsiTypeParameter) {
final PsiClass superClass = cls.getSuperClass();
key = cls.getName() + (superClass == null ? CommonClassNames.JAVA_LANG_OBJECT : superClass.getName());
}
else {
key = TypeConversionUtil.erasure(base).getCanonicalText();
}
if (key == null) key = "";
Map<String, PsiType> result = cache.get(key);
if (result == null) {