[Analysis API] optimize composite scope

Do not create KtCompositeScope for empty or single scopes
This commit is contained in:
Ilya Kirillov
2023-05-12 15:29:57 +02:00
committed by Space Team
parent 950a32901c
commit ee1fd9f6e9
7 changed files with 28 additions and 7 deletions
@@ -35,6 +35,7 @@ sourceSets {
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions.freeCompilerArgs += "-Xcontext-receivers"
kotlinOptions.freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals"
}
testsJar()
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.analysis.api.impl.base.scopes
import org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals
import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
import org.jetbrains.kotlin.analysis.api.scopes.KtScope
@@ -12,10 +13,18 @@ import org.jetbrains.kotlin.analysis.api.scopes.KtScopeNameFilter
import org.jetbrains.kotlin.analysis.api.symbols.*
import org.jetbrains.kotlin.name.Name
class KtCompositeScope(
@KtAnalysisApiInternals
class KtCompositeScope private constructor(
private val subScopes: List<KtScope>,
override val token: KtLifetimeToken
override val token: KtLifetimeToken,
) : KtScope {
init {
require(subScopes.size > 1) {
"Required `subScopes.size > 1` but `subScopes.size = ${subScopes.size}`"
}
}
override fun getAllPossibleNames(): Set<Name> = withValidityAssertion {
buildSet {
subScopes.flatMapTo(this) { it.getAllPossibleNames() }
@@ -81,4 +90,13 @@ class KtCompositeScope(
override fun mayContainName(name: Name): Boolean = withValidityAssertion {
subScopes.any { it.mayContainName(name) }
}
companion object {
fun create(subScopes: List<KtScope>, token: KtLifetimeToken): KtScope =
when (subScopes.size) {
0 -> KtEmptyScope(token)
1 -> subScopes.single()
else -> KtCompositeScope(subScopes, token)
}
}
}