[LL FIR] rename collectDesignationWithFile to collectDesignation
It should have a more simple name as it is the main function now ^KT-65344
This commit is contained in:
committed by
Space Team
parent
0b4dac9d8d
commit
cc46b6e3e9
+12
-12
@@ -307,12 +307,12 @@ private fun findKotlinStdlibClass(classId: ClassId, target: FirDeclaration): Fir
|
||||
}
|
||||
|
||||
/**
|
||||
* Consider using this function only if [collectDesignationWithFile] is not applicable.
|
||||
* Consider using this function only if [collectDesignation] is not applicable.
|
||||
*
|
||||
* @return [FirDesignation] where [FirDesignation.fileOrNull] can be null or throws an exception.
|
||||
*
|
||||
* @see collectDesignationWithFile
|
||||
* @see tryCollectDesignationWithFile
|
||||
* @see collectDesignation
|
||||
* @see tryCollectDesignation
|
||||
* @see tryCollectDesignationWithOptionalFile
|
||||
*/
|
||||
fun FirElementWithResolveState.collectDesignationWithOptionalFile(providedFile: FirFile? = null): FirDesignation =
|
||||
@@ -324,22 +324,22 @@ fun FirElementWithResolveState.collectDesignationWithOptionalFile(providedFile:
|
||||
* @return [FirDesignation] where [FirDesignation.fileOrNull] not null or throws an exception.
|
||||
*
|
||||
* @see collectDesignationWithOptionalFile
|
||||
* @see tryCollectDesignationWithFile
|
||||
* @see tryCollectDesignation
|
||||
* @see tryCollectDesignationWithOptionalFile
|
||||
*/
|
||||
fun FirElementWithResolveState.collectDesignationWithFile(providedFile: FirFile? = null): FirDesignation =
|
||||
tryCollectDesignationWithFile(providedFile) ?: errorWithAttachment("No designation of local declaration") {
|
||||
withFirEntry("FirDeclaration", this@collectDesignationWithFile)
|
||||
fun FirElementWithResolveState.collectDesignation(providedFile: FirFile? = null): FirDesignation =
|
||||
tryCollectDesignation(providedFile) ?: errorWithAttachment("No designation of local declaration") {
|
||||
withFirEntry("FirDeclaration", this@collectDesignation)
|
||||
}
|
||||
|
||||
/**
|
||||
* Consider using this function only if [tryCollectDesignationWithFile] is not applicable.
|
||||
* Consider using this function only if [tryCollectDesignation] is not applicable.
|
||||
*
|
||||
* @return [FirDesignation] where [FirDesignation.fileOrNull] can be null or null.
|
||||
*
|
||||
* @see collectDesignationWithOptionalFile
|
||||
* @see collectDesignationWithFile
|
||||
* @see tryCollectDesignationWithFile
|
||||
* @see collectDesignation
|
||||
* @see tryCollectDesignation
|
||||
*/
|
||||
fun FirElementWithResolveState.tryCollectDesignationWithOptionalFile(providedFile: FirFile? = null): FirDesignation? =
|
||||
tryCollectDesignation(providedFile = providedFile, target = this)
|
||||
@@ -347,11 +347,11 @@ fun FirElementWithResolveState.tryCollectDesignationWithOptionalFile(providedFil
|
||||
/**
|
||||
* @return [FirDesignation] with not-null [FirDesignation.file] or null.
|
||||
*
|
||||
* @see collectDesignationWithFile
|
||||
* @see collectDesignation
|
||||
* @see tryCollectDesignationWithOptionalFile
|
||||
* @see collectDesignationWithOptionalFile
|
||||
*/
|
||||
fun FirElementWithResolveState.tryCollectDesignationWithFile(providedFile: FirFile? = null): FirDesignation? = when (this) {
|
||||
fun FirElementWithResolveState.tryCollectDesignation(providedFile: FirFile? = null): FirDesignation? = when (this) {
|
||||
is FirSyntheticProperty, is FirSyntheticPropertyAccessor -> unexpectedElementError<FirElementWithResolveState>(this)
|
||||
is FirFileAnnotationsContainer, is FirDeclaration -> {
|
||||
val designation = tryCollectDesignation(providedFile = providedFile, target = this)
|
||||
|
||||
+2
-2
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir
|
||||
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.ContextByDesignationCollector
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDesignation
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDesignationWithFile
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDesignation
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.withFirDesignationEntry
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.containingClassIdOrNull
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.isLocalForLazyResolutionPurposes
|
||||
@@ -89,7 +89,7 @@ internal object PersistenceContextCollector {
|
||||
withFirEntry("declaration", declaration)
|
||||
}
|
||||
|
||||
val designation = declaration.collectDesignationWithFile(firFile)
|
||||
val designation = declaration.collectDesignation(firFile)
|
||||
designation.path.forEach { firClass ->
|
||||
firClass.lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE)
|
||||
}
|
||||
|
||||
+2
-2
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure
|
||||
|
||||
import org.jetbrains.kotlin.KtFakeSourceElementKind
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirModuleResolveComponents
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDesignationWithFile
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDesignation
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirClassWithSpecificMembersResolveTarget
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.resolve
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.isImplicitConstructor
|
||||
@@ -55,7 +55,7 @@ internal object FileElementFactory {
|
||||
}
|
||||
}
|
||||
|
||||
val firClassDesignation = firClass.collectDesignationWithFile()
|
||||
val firClassDesignation = firClass.collectDesignation()
|
||||
val designationWithMembers = LLFirClassWithSpecificMembersResolveTarget(
|
||||
firClassDesignation,
|
||||
classMembersToResolve,
|
||||
|
||||
+2
-2
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirResolveT
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirWholeElementResolveTarget
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.asResolveTarget
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.throwUnexpectedFirElementError
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.tryCollectDesignationWithFile
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.tryCollectDesignation
|
||||
import org.jetbrains.kotlin.fir.FirElementWithResolveState
|
||||
import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer
|
||||
import org.jetbrains.kotlin.fir.declarations.*
|
||||
@@ -50,7 +50,7 @@ internal object LLFirResolveMultiDesignationCollector {
|
||||
target is FirBackingField -> getFirDesignationToResolve(target.propertySymbol.fir)
|
||||
target is FirTypeParameter -> getFirDesignationToResolve(target.containingDeclarationSymbol.fir)
|
||||
target is FirValueParameter -> getFirDesignationToResolve(target.containingFunctionSymbol.fir)
|
||||
else -> target.tryCollectDesignationWithFile()
|
||||
else -> target.tryCollectDesignation()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -5,7 +5,7 @@
|
||||
|
||||
package org.jetbrains.kotlin.analysis.low.level.api.fir.transformers
|
||||
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDesignationWithFile
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDesignation
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirResolveTarget
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.asResolveTarget
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.throwUnexpectedFirElementError
|
||||
@@ -63,7 +63,7 @@ private class LLFirCompilerRequiredAnnotationsTargetResolver(
|
||||
if (regularClass.resolvePhase >= resolverPhase) return
|
||||
|
||||
symbol.lazyResolveToPhase(resolverPhase.previous)
|
||||
val designation = regularClass.collectDesignationWithFile().asResolveTarget()
|
||||
val designation = regularClass.collectDesignation().asResolveTarget()
|
||||
val targetSession = designation.target.llFirSession
|
||||
val resolver = LLFirCompilerRequiredAnnotationsTargetResolver(
|
||||
designation,
|
||||
|
||||
+2
-2
@@ -5,7 +5,7 @@
|
||||
|
||||
package org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder
|
||||
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDesignationWithFile
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDesignation
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.asResolveTarget
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirLockProvider
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.llFirSession
|
||||
@@ -33,7 +33,7 @@ internal class LLFirReturnTypeCalculatorWithJump(
|
||||
|
||||
declaration.lazyResolveToPhase(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE.previous)
|
||||
|
||||
val designation = declaration.collectDesignationWithFile().asResolveTarget()
|
||||
val designation = declaration.collectDesignation().asResolveTarget()
|
||||
val targetSession = designation.target.llFirSession
|
||||
val computationSession = implicitBodyResolveComputationSession as LLImplicitBodyResolveComputationSession
|
||||
val resolver = LLFirImplicitBodyTargetResolver(
|
||||
|
||||
+2
-2
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirResolveT
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirSingleResolveTarget
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.asResolveTarget
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.session
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.tryCollectDesignationWithFile
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.tryCollectDesignation
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirLockProvider
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.llFirSession
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkDeclarationStatusIsResolved
|
||||
@@ -257,7 +257,7 @@ private class LLFirStatusTargetResolver(
|
||||
}
|
||||
}
|
||||
|
||||
val target = regularClass.tryCollectDesignationWithFile()?.asResolveTarget() ?: return false
|
||||
val target = regularClass.tryCollectDesignation()?.asResolveTarget() ?: return false
|
||||
val targetSession = target.target.llFirSession
|
||||
val resolver = LLFirStatusTargetResolver(
|
||||
target,
|
||||
|
||||
+3
-3
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirResolveT
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirSingleResolveTarget
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.asResolveTarget
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.session
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.tryCollectDesignationWithFile
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.tryCollectDesignation
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirLockProvider
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession
|
||||
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.llFirSession
|
||||
@@ -182,7 +182,7 @@ private class LLFirSuperTypeTargetResolver(
|
||||
|
||||
private fun FirClassLikeDeclaration.asResolveTarget(): LLFirSingleResolveTarget? {
|
||||
return takeIf { supertypeComputationSession.canHaveLoopInSupertypesHierarchy(it) }
|
||||
?.tryCollectDesignationWithFile()
|
||||
?.tryCollectDesignation()
|
||||
?.asResolveTarget()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user