Delete remains of external annotations support from compiler
This commit is contained in:
@@ -23,8 +23,6 @@ import org.jetbrains.kotlin.descriptors.Modality
|
||||
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
|
||||
import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport
|
||||
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
|
||||
import org.jetbrains.kotlin.load.java.JvmAnnotationNames.*
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
|
||||
import org.jetbrains.kotlin.resolve.DescriptorUtils
|
||||
import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
|
||||
@@ -84,10 +82,6 @@ private fun KotlinType.approximateNonDynamicFlexibleTypes(
|
||||
)
|
||||
}
|
||||
|
||||
private fun KotlinType.hasAnnotationMaybeExternal(fqName: FqName) = with (annotations) {
|
||||
findAnnotation(fqName) ?: findExternalAnnotation(fqName)
|
||||
} != null
|
||||
|
||||
fun KotlinType.isResolvableInScope(scope: LexicalScope?, checkTypeParameters: Boolean, allowIntersections: Boolean = false): Boolean {
|
||||
if (constructor is IntersectionTypeConstructor) {
|
||||
if (!allowIntersections) return false
|
||||
|
||||
@@ -58,7 +58,7 @@ private fun AnnotationDescriptor.getBundleName(): String? {
|
||||
}
|
||||
|
||||
private fun DeclarationDescriptor.getBundleNameByAnnotation(): String? {
|
||||
return (annotations.findAnnotation(PROPERTY_KEY) ?: annotations.findExternalAnnotation(PROPERTY_KEY))?.getBundleName()
|
||||
return annotations.findAnnotation(PROPERTY_KEY)?.getBundleName()
|
||||
}
|
||||
|
||||
private fun KtExpression.getBundleNameByContext(): String? {
|
||||
|
||||
Reference in New Issue
Block a user