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

Minor, do not report "no reflection" error on KTypeParameter

Browse Source 
Since an implementation of KTypeParameter for stdlib is coming, an
instance of which can be obtained through `typeOf`.
This commit is contained in:
Alexander Udalov
2020-05-08 20:52:13 +02:00
parent 37cf7316bc
commit 6fb40878c4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/AbstractReflectionApiCallChecker.kt
+6 -5
View File
@@ -31,10 +31,13 @@ import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.storage.getValue import org.jetbrains.kotlin.storage.getValue
import org.jetbrains.kotlin.util.OperatorNameConventions import org.jetbrains.kotlin.util.OperatorNameConventions
private val ANY_MEMBER_NAMES = setOf("equals", "hashCode", "toString") private val ALLOWED_MEMBER_NAMES = setOf(
"equals", "hashCode", "toString", "invoke", "name"
)
private val ALLOWED_CLASSES = setOf( private val ALLOWED_CLASSES = setOf(
FqName("kotlin.reflect.KType"), FqName("kotlin.reflect.KType"),
FqName("kotlin.reflect.KTypeParameter"),
FqName("kotlin.reflect.KTypeProjection"), FqName("kotlin.reflect.KTypeProjection"),
FqName("kotlin.reflect.KTypeProjection.Companion"), FqName("kotlin.reflect.KTypeProjection.Companion"),
FqName("kotlin.reflect.KVariance") FqName("kotlin.reflect.KVariance")
@@ -76,10 +79,8 @@ abstract class AbstractReflectionApiCallChecker(
protected open fun isAllowedReflectionApi(descriptor: CallableDescriptor, containingClass: ClassDescriptor): Boolean { protected open fun isAllowedReflectionApi(descriptor: CallableDescriptor, containingClass: ClassDescriptor): Boolean {
val name = descriptor.name val name = descriptor.name
return name.asString() in ANY_MEMBER_NAMES || return name.asString() in ALLOWED_MEMBER_NAMES ||
name == OperatorNameConventions.INVOKE || DescriptorUtils.isSubclass(containingClass, kClass) && isAllowedKClassMember(name) ||
name.asString() == "name" ||
DescriptorUtils.isSubclass(containingClass, kClass) && isAllowedKClassMember(descriptor.name) ||
(name.asString() == "get" || name.asString() == "set") && containingClass.isKPropertyClass() || (name.asString() == "get" || name.asString() == "set") && containingClass.isKPropertyClass() ||
containingClass.fqNameSafe in ALLOWED_CLASSES containingClass.fqNameSafe in ALLOWED_CLASSES
} }