azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'isSubclass' method refactoring

Browse Source
This commit is contained in:
Svetlana Isakova
2012-04-17 20:47:51 +04:00
parent e4026c6465
commit f208f9c64a
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
+4 -5
View File
@@ -281,17 +281,16 @@ public class DescriptorUtils {
} }
public static boolean isSubclass(@NotNull ClassDescriptor subClass, @NotNull ClassDescriptor superClass) { public static boolean isSubclass(@NotNull ClassDescriptor subClass, @NotNull ClassDescriptor superClass) {
DeclarationDescriptor superOriginal = superClass.getOriginal(); return isSubtypeOfClass(subClass.getDefaultType(), superClass.getOriginal());
return hasEqualSuperType(subClass.getDefaultType(), superOriginal);
} }
private static boolean hasEqualSuperType(@NotNull JetType type, @NotNull DeclarationDescriptor superOriginal) { private static boolean isSubtypeOfClass(@NotNull JetType type, @NotNull DeclarationDescriptor superClass) {
DeclarationDescriptor descriptor = type.getConstructor().getDeclarationDescriptor(); DeclarationDescriptor descriptor = type.getConstructor().getDeclarationDescriptor();
if (descriptor != null && superOriginal.equals(descriptor.getOriginal())) { if (descriptor != null && superClass == descriptor.getOriginal()) {
return true; return true;
} }
for (JetType superType : type.getConstructor().getSupertypes()) { for (JetType superType : type.getConstructor().getSupertypes()) {
if (hasEqualSuperType(superType, superOriginal)) { if (isSubtypeOfClass(superType, superClass)) {
return true; return true;
} }
} }