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

[FIR] Don't create generated nested classifier scope for non-source classes

Browse Source 
^KT-57626 Fixed
This commit is contained in:
Dmitriy Novozhilov
2023-03-28 14:10:05 +03:00
committed by Space Team
parent ea6651445c
commit fb97f4db87
4 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirDeclaredMemberScopeProvider.kt
+5 -2
View File
@@ -91,11 +91,14 @@ class FirDeclaredMemberScopeProvider(val useSiteSession: FirSession) : FirSessio
}
private fun createNestedClassifierScope(klass: FirClass): FirNestedClassifierScope? {
return if (klass.origin.generated) {
val origin = klass.origin
return if (origin.generated) {
FirGeneratedClassNestedClassifierScope.create(useSiteSession, klass, baseScope = null)
} else {
val baseScope = FirNestedClassifierScopeImpl(klass, useSiteSession)
val generatedScope = FirGeneratedClassNestedClassifierScope.create(useSiteSession, klass, baseScope)
val generatedScope = runIf(origin.fromSource) {
FirGeneratedClassNestedClassifierScope.create(useSiteSession, klass, baseScope)
}
if (generatedScope != null) {
FirCompositeNestedClassifierScope(
listOf(baseScope, generatedScope),