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

[FIR] Create generated declared scope only for classes from sources and plugins

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2022-06-06 12:37:38 +03:00
committed by teamcity
parent f5637e5077
commit d527b00dfc
1 changed files with 10 additions and 6 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
+10 -6
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.fir.scopes.FirTypeScope
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.utils.addToStdlib.runIf
@ThreadSafeMutableState @ThreadSafeMutableState
class FirDeclaredMemberScopeProvider(val useSiteSession: FirSession) : FirSessionComponent { class FirDeclaredMemberScopeProvider(val useSiteSession: FirSession) : FirSessionComponent {
@@ -52,8 +53,9 @@ class FirDeclaredMemberScopeProvider(val useSiteSession: FirSession) : FirSessio
existingNames: List<Name>?, existingNames: List<Name>?,
symbolProvider: FirSymbolProvider? symbolProvider: FirSymbolProvider?
): FirContainingNamesAwareScope { ): FirContainingNamesAwareScope {
val origin = klass.origin
return when { return when {
klass.origin.generated -> { origin.generated -> {
FirGeneratedClassDeclaredMemberScope.create( FirGeneratedClassDeclaredMemberScope.create(
useSiteSession, useSiteSession,
MemberGenerationContext(klass.symbol, declaredMemberScope = null), MemberGenerationContext(klass.symbol, declaredMemberScope = null),
@@ -68,11 +70,13 @@ class FirDeclaredMemberScopeProvider(val useSiteSession: FirSession) : FirSessio
existingNames, existingNames,
symbolProvider symbolProvider
) )
val generatedScope = FirGeneratedClassDeclaredMemberScope.create( val generatedScope = runIf(origin.fromSource || origin.generated) {
useSiteSession, FirGeneratedClassDeclaredMemberScope.create(
MemberGenerationContext(klass.symbol, baseScope), useSiteSession,
needNestedClassifierScope = false MemberGenerationContext(klass.symbol, baseScope),
) needNestedClassifierScope = false
)
}
if (generatedScope != null) { if (generatedScope != null) {
FirNameAwareCompositeScope(listOf(baseScope, generatedScope)) FirNameAwareCompositeScope(listOf(baseScope, generatedScope))
} else { } else {