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

Extract special generic signatures to compiler.common.jvm to reuse in FIR

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-10-14 11:52:06 +03:00
parent 0e7acd6e8b
commit f866eff93e
5 changed files with 146 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/platformWrappers.kt
+3 -3
View File
@@ -35,9 +35,9 @@ import org.jetbrains.kotlin.builtins.DefaultBuiltIns
import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature
import org.jetbrains.kotlin.load.java.BuiltinSpecialProperties
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.load.java.SpecialGenericSignatures
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.UserDataProperty
@@ -51,7 +51,7 @@ private val mutableQualifiedNamesToJavaClass = JavaToKotlinClassMap.mutabilityMa
}
private val membersWithSpecializedSignature: Set<String> =
BuiltinMethodsWithSpecialGenericSignature.ERASED_VALUE_PARAMETERS_SIGNATURES.mapTo(LinkedHashSet()) {
SpecialGenericSignatures.ERASED_VALUE_PARAMETERS_SIGNATURES.mapTo(LinkedHashSet()) {
val fqNameString = it.substringBefore('(').replace('/', '.')
FqName(fqNameString).shortName().asString()
}
@@ -124,7 +124,7 @@ class KtLightMutabilityPlatformWrapper(
return listOf(finalBridgeWithObject, abstractKotlinVariantWithGeneric)
}
if (methodName in BuiltinMethodsWithSpecialGenericSignature.ERASED_COLLECTION_PARAMETER_NAMES) {
if (methodName in SpecialGenericSignatures.ERASED_COLLECTION_PARAMETER_NAMES) {
return emptyList()
}