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

[FIR] Remove the type parameters scope duplicate

Browse Source
This commit is contained in:
Nikolay Lunyak
2021-09-28 15:27:11 +03:00
parent e5d5e5be44
commit 8496729597
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt
+5 -3
View File
@@ -163,7 +163,7 @@ private fun FirClassLikeDeclaration.typeParametersScope(): FirScope? {
return FirMemberTypeParameterScope(this) return FirMemberTypeParameterScope(this)
} }
private fun createScopesForNestedClasses( private fun createOtherScopesForNestedClasses(
klass: FirClass, klass: FirClass,
session: FirSession, session: FirSession,
scopeSession: ScopeSession, scopeSession: ScopeSession,
@@ -185,7 +185,9 @@ private fun createScopesForNestedClasses(
it.lookupTag.getNestedClassifierScope(session, scopeSession) it.lookupTag.getNestedClassifierScope(session, scopeSession)
?.wrapNestedClassifierScopeWithSubstitutionForSuperType(it, session) ?.wrapNestedClassifierScopeWithSubstitutionForSuperType(it, session)
} }
addIfNotNull(klass.typeParametersScope()) // The type parameters scope has already been
// added by this time;
// See: prepareScopes()
} }
fun FirRegularClass.resolveSupertypesInTheAir(session: FirSession): List<FirTypeRef> { fun FirRegularClass.resolveSupertypesInTheAir(session: FirSession): List<FirTypeRef> {
@@ -225,7 +227,7 @@ open class FirSupertypeResolverVisitor(
val scopes = prepareScopes(klass) val scopes = prepareScopes(klass)
resolveAllSupertypes(klass, klass.superTypeRefs) resolveAllSupertypes(klass, klass.superTypeRefs)
scopes.pushAll(createScopesForNestedClasses(klass, session, scopeSession, supertypeComputationSession)) scopes.pushAll(createOtherScopesForNestedClasses(klass, session, scopeSession, supertypeComputationSession))
} }
} }