diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaAnnotationSyntheticPropertiesScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaAnnotationSyntheticPropertiesScope.kt index c65dff802bf..faa4884c1bb 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaAnnotationSyntheticPropertiesScope.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaAnnotationSyntheticPropertiesScope.kt @@ -87,4 +87,8 @@ class JavaAnnotationSyntheticPropertiesScope( override fun getClassifierNames(): Set { return delegateScope.getClassifierNames() } + + override fun toString(): String { + return "Java annotation synthetic properties scope for $classId" + } } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassMembersEnhancementScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassMembersEnhancementScope.kt index c8712ba7167..0c2a32a2171 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassMembersEnhancementScope.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassMembersEnhancementScope.kt @@ -133,4 +133,8 @@ class JavaClassMembersEnhancementScope( override fun mayContainName(name: Name): Boolean { return useSiteMemberScope.mayContainName(name) } + + override fun toString(): String { + return "Java enhancement scope for ${owner.classId}" + } } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt index baa91b04970..d9d49dd2ac0 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt @@ -501,6 +501,10 @@ class JavaClassUseSiteMemberScope( null } } + + override fun toString(): String { + return "Java use site scope of $classId" + } } private fun FirCallableSymbol<*>.isFromBuiltInClass(session: FirSession) = diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt index b8b57f8cbaa..88b79b675d6 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt @@ -209,4 +209,8 @@ class JvmMappedScope( return Signatures(visibleMethodsByName, hiddenConstructors) } } + + override fun toString(): String { + return "JVM mapped scope for ${firKotlinClass.classId}" + } } diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt index 83dc4f79b25..2d9b2c62a8c 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt @@ -347,6 +347,10 @@ class FirClassSubstitutionScope( override fun getClassifierNames(): Set { return useSiteMemberScope.getClassifierNames() } + + override fun toString(): String { + return "Substitution scope for [$useSiteMemberScope] for type $dispatchReceiverTypeForSubstitutedMembers" + } } class FirSubstitutionOverrideStorage(val session: FirSession) : FirSessionComponent { diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassUseSiteMemberScope.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassUseSiteMemberScope.kt index c6c4afb43cb..3d5180084a3 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassUseSiteMemberScope.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassUseSiteMemberScope.kt @@ -55,4 +55,8 @@ class FirClassUseSiteMemberScope( } return result } + + override fun toString(): String { + return "Use site scope of $classId" + } } diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirScopeWithFakeOverrideTypeCalculator.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirScopeWithFakeOverrideTypeCalculator.kt index 5bbe97b1961..526132c711f 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirScopeWithFakeOverrideTypeCalculator.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirScopeWithFakeOverrideTypeCalculator.kt @@ -83,4 +83,8 @@ class FirScopeWithFakeOverrideTypeCalculator( override val scopeOwnerLookupNames: List get() = delegate.scopeOwnerLookupNames + + override fun toString(): String { + return delegate.toString() + } } diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt index c7df498e22f..75993269c82 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt @@ -127,6 +127,10 @@ class FirTypeIntersectionScope private constructor( return scopes.flatMapTo(hashSetOf()) { it.getClassifierNames() } } + override fun toString(): String { + return "Intersection of [${scopes.joinToString(", ")}]" + } + companion object { fun prepareIntersectionScope( session: FirSession, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirTypeScope.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirTypeScope.kt index cf587a67e89..7bf8513c03f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirTypeScope.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirTypeScope.kt @@ -58,6 +58,10 @@ abstract class FirTypeScope : FirContainingNamesAwareScope() { override fun getCallableNames(): Set = emptySet() override fun getClassifierNames(): Set = emptySet() + + override fun toString(): String { + return "Empty scope" + } } protected companion object {