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

[LL FIR] LLFirSupertypeLazyResolver: covert receiver to parameter

Browse Source 
To separate it from the next refactoring

^KT-63547
This commit is contained in:
Dmitrii Gridin
2023-12-21 00:20:44 +01:00
committed by Space Team
parent 14082f6924
commit 35a7e0db12
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirSupertypeLazyResolver.kt
+13 -10
View File
@@ -175,7 +175,7 @@ private class LLFirSuperTypeTargetResolver(
} }
private fun FirClassLikeDeclaration.asResolveTarget(): LLFirSingleResolveTarget? { private fun FirClassLikeDeclaration.asResolveTarget(): LLFirSingleResolveTarget? {
return takeIf { it.canHaveLoopInSupertypesHierarchy(resolveTargetSession) } return takeIf { canHaveLoopInSupertypesHierarchy(it, resolveTargetSession) }
?.tryCollectDesignationWithFile() ?.tryCollectDesignationWithFile()
?.asResolveTarget() ?.asResolveTarget()
} }
@@ -201,7 +201,7 @@ private class LLFirSuperTypeTargetResolver(
if (classLikeDeclaration !is FirClassLikeDeclaration) return if (classLikeDeclaration !is FirClassLikeDeclaration) return
if (classLikeDeclaration in visitedElements) return if (classLikeDeclaration in visitedElements) return
if (classLikeDeclaration is FirJavaClass) { if (classLikeDeclaration is FirJavaClass) {
if (!classLikeDeclaration.canHaveLoopInSupertypesHierarchy(resolveTargetSession)) return if (!canHaveLoopInSupertypesHierarchy(classLikeDeclaration, resolveTargetSession)) return
visitedElements += classLikeDeclaration visitedElements += classLikeDeclaration
val parentClass = classLikeDeclaration.outerClass(resolveTargetSession) val parentClass = classLikeDeclaration.outerClass(resolveTargetSession)
@@ -239,14 +239,17 @@ private class LLFirSuperTypeTargetResolver(
* means that this class can't have loop with our class, because in this case this declaration will be present * means that this class can't have loop with our class, because in this case this declaration will be present
* in the current supertypes resolve session * in the current supertypes resolve session
*/ */
private fun FirClassLikeDeclaration.canHaveLoopInSupertypesHierarchy(session: FirSession): Boolean = when { private fun canHaveLoopInSupertypesHierarchy(
this is FirJavaClass -> origin is FirDeclarationOrigin.Java.Source classLikeDeclaration: FirClassLikeDeclaration,
origin !is FirDeclarationOrigin.Source -> false session: FirSession,
resolvePhase < FirResolvePhase.SUPER_TYPES -> true ): Boolean = when {
classLikeDeclaration is FirJavaClass -> classLikeDeclaration.origin is FirDeclarationOrigin.Java.Source
classLikeDeclaration.origin !is FirDeclarationOrigin.Source -> false
classLikeDeclaration.resolvePhase < FirResolvePhase.SUPER_TYPES -> true
// We should still process resolved if it has loop in super type refs, because we can be part of this cycle // We should still process resolved if it has loop in super type refs, because we can be part of this cycle
this is FirRegularClass && superTypeRefs.any(FirTypeRef::isLoopedSupertypeRef) -> true classLikeDeclaration is FirRegularClass && classLikeDeclaration.superTypeRefs.any(FirTypeRef::isLoopedSupertypeRef) -> true
this is FirTypeAlias && expandedTypeRef.isLoopedSupertypeRef -> true classLikeDeclaration is FirTypeAlias && classLikeDeclaration.expandedTypeRef.isLoopedSupertypeRef -> true
else -> outerClass(session)?.canHaveLoopInSupertypesHierarchy(session) == true else -> classLikeDeclaration.outerClass(session)?.let { canHaveLoopInSupertypesHierarchy(it, session) } == true
} }
private fun FirClassLikeDeclaration.outerClass(session: FirSession): FirRegularClass? = symbol.classId.parentClassId?.let { parentClassId -> private fun FirClassLikeDeclaration.outerClass(session: FirSession): FirRegularClass? = symbol.classId.parentClassId?.let { parentClassId ->
@@ -299,7 +302,7 @@ private class LLFirSupertypeComputationSession(private val session: FirSession)
} }
override fun isAlreadyResolved(classLikeDeclaration: FirClassLikeDeclaration): Boolean { override fun isAlreadyResolved(classLikeDeclaration: FirClassLikeDeclaration): Boolean {
return !classLikeDeclaration.canHaveLoopInSupertypesHierarchy(session) return !canHaveLoopInSupertypesHierarchy(classLikeDeclaration, session)
} }
/** /**