Drop support of java.lang.Class as annotation parameter

Also drop some related diagnostics and testData
This commit is contained in:
Denis Zharkov
2015-06-09 18:14:33 +03:00
parent d71fe0d11a
commit da254ab1a0
13 changed files with 3 additions and 80 deletions
@@ -541,8 +541,4 @@ public class DescriptorUtils {
}
}
}
public static boolean isJavaLangClass(ClassDescriptor descriptor) {
return "java.lang.Class".equals(getFqName(descriptor).asString());
}
}
@@ -86,18 +86,6 @@ fun JetType.replaceAnnotations(newAnnotations: Annotations): JetType {
}
}
public fun JetType.isJavaLangClass(): Boolean {
val classifier = getConstructor().getDeclarationDescriptor()
if (classifier !is ClassDescriptor) return false
return DescriptorUtils.isJavaLangClass(classifier)
}
public fun JetType.isArrayOfJavaLangClass(): Boolean =
KotlinBuiltIns.isArray(this) && getArguments().firstOrNull()?.getType()?.isJavaLangClass() ?: false
public fun JetType.isJavaLangClassOrArray(): Boolean = isJavaLangClass() || isArrayOfJavaLangClass()
public fun JetTypeChecker.equalTypesOrNulls(type1: JetType?, type2: JetType?): Boolean {
if (type1 identityEquals type2) return true
if (type1 == null || type2 == null) return false