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

Reimplement the fix for KtSuperTypeList.findEntry

Browse Source
This commit is contained in:
Pavel Mikhailovskii
2023-03-03 15:38:12 +00:00
committed by Space Team
parent 499ab48d30
commit a6e1826bbc
7 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinSuperTypeListBuilder.kt
+7 -1
View File
@@ -32,7 +32,7 @@ class KotlinSuperTypeListBuilder(
override fun getParent() = this@KotlinSuperTypeListBuilder
val kotlinOrigin by lazyPub {
element.qualifiedName?.let { this@KotlinSuperTypeListBuilder.myKotlinOrigin?.findEntry(it) }
element.nameFromSource?.let { this@KotlinSuperTypeListBuilder.myKotlinOrigin?.findEntry(it) }
}
override fun delete() {
@@ -81,3 +81,9 @@ class KotlinSuperTypeListBuilder(
return null
}
}
private val PsiQualifiedReference.nameFromSource: String?
get() {
val name = referenceName ?: return null
return (qualifier as? PsiQualifiedReference)?.let { "${it.nameFromSource}.$name" } ?: name
}
analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt
+4 -17
View File
@@ -13,24 +13,11 @@ import com.intellij.util.IncorrectOperationException
import org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService
import org.jetbrains.kotlin.psi.*
fun KtSuperTypeList.findEntry(fqNameToFind: String): KtSuperTypeListEntry? {
val name = fqNameToFind.substringAfterLast(delimiter = '.', missingDelimiterValue = "")
if (name.isEmpty()) {
return entries.find { it.typeAsUserType?.textMatches(fqNameToFind) == true }
}
fun KtSuperTypeList.findEntry(fqNameToFind: String): KtSuperTypeListEntry? =
entries.find { it.typeAsUserType?.fqName == fqNameToFind }
val qualifier = fqNameToFind.substringBeforeLast('.')
val entries = entries.mapNotNull { entry -> entry.typeAsUserType?.let { entry to it } }
.filter { (_, type) -> type.referencedName == name && (type.qualifier?.textMatches(qualifier) != false) }
.ifEmpty { return null }
return if (entries.size == 1) {
entries.first().first
} else {
val entry = entries.firstOrNull { it.second.qualifier != null } ?: entries.firstOrNull()
entry?.first
}
}
private val KtUserType.fqName: String?
get() = qualifier?.let { "${it.fqName}.$referencedName" } ?: referencedName
// NOTE: avoid using blocking lazy in light classes, it leads to deadlocks
fun <T> lazyPub(initializer: () -> T) = lazy(LazyThreadSafetyMode.PUBLICATION, initializer)