From b1895aacc10f8472632261e3c0ca51087209d095 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Mon, 31 Jul 2023 22:29:44 +0900 Subject: [PATCH] [LL API] Use a common type of 'KtDeclaration' and 'KtCodeFragment' --- .../api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt | 4 ++-- .../low/level/api/fir/file/structure/inBlockModification.kt | 6 +++--- .../level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt | 2 +- .../fir/lazy/resolve/RawFirNonLocalDeclarationBuilder.kt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt index 2bca1f45379..96bbef853af 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt @@ -52,7 +52,7 @@ object LowLevelFirApiFacadeForResolveOnAir { else -> true } - private fun PsiElement.getNonLocalContainingOrThisDeclarationCodeFragmentAware(predicate: (KtDeclaration) -> Boolean): KtElement? { + private fun PsiElement.getNonLocalContainingOrThisDeclarationCodeFragmentAware(predicate: (KtDeclaration) -> Boolean): KtAnnotated? { return getNonLocalContainingOrThisDeclaration(predicate) ?: containingFile as? KtCodeFragment } @@ -342,7 +342,7 @@ object LowLevelFirApiFacadeForResolveOnAir { } private fun requiredResolvePhase( - container: KtElement, + container: KtAnnotated, elementToReplace: PsiElement, ): FirResolvePhase { assert(container is KtDeclaration || container is KtCodeFragment) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/inBlockModification.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/inBlockModification.kt index 868fe2fdd88..b56af453f01 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/inBlockModification.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/inBlockModification.kt @@ -22,9 +22,9 @@ import org.jetbrains.kotlin.fir.expressions.FirLazyExpression import org.jetbrains.kotlin.fir.expressions.builder.buildLazyBlock import org.jetbrains.kotlin.fir.expressions.builder.buildLazyExpression import org.jetbrains.kotlin.fir.expressions.impl.FirContractCallBlock +import org.jetbrains.kotlin.psi.KtAnnotated import org.jetbrains.kotlin.psi.KtCodeFragment import org.jetbrains.kotlin.psi.KtDeclaration -import org.jetbrains.kotlin.psi.KtElement @Deprecated( "Temporarily left for binary compatibility. Use invalidateAfterInBlockModification(KtElement) instead.", @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.KtElement @LLFirInternals @Suppress("unused") fun invalidateAfterInBlockModification(declaration: KtDeclaration): Boolean { - return invalidateAfterInBlockModification(declaration as KtElement) + return invalidateAfterInBlockModification(declaration as KtAnnotated) } /** @@ -42,7 +42,7 @@ fun invalidateAfterInBlockModification(declaration: KtDeclaration): Boolean { * @return **false** if it is not in-block modification */ @LLFirInternals -fun invalidateAfterInBlockModification(declaration: KtElement): Boolean { +fun invalidateAfterInBlockModification(declaration: KtAnnotated): Boolean { ApplicationManager.getApplication().assertIsWriteThread() val project = declaration.project diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt index f5c41b8d983..8f9d9f1f053 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt @@ -87,7 +87,7 @@ private inline fun revive( session = session, scopeProvider = session.kotlinScopeProvider, designation = designation, - rootNonLocalDeclaration = psiFactory(designation) as KtElement, + rootNonLocalDeclaration = psiFactory(designation) as KtAnnotated, ) as T } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirNonLocalDeclarationBuilder.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirNonLocalDeclarationBuilder.kt index ad46412b53c..4ef036a5bfd 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirNonLocalDeclarationBuilder.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirNonLocalDeclarationBuilder.kt @@ -68,7 +68,7 @@ internal class RawFirNonLocalDeclarationBuilder private constructor( session: FirSession, scopeProvider: FirScopeProvider, designation: FirDesignation, - rootNonLocalDeclaration: KtElement, + rootNonLocalDeclaration: KtAnnotated, ): FirDeclaration { val functionsToRebind = when (val originalDeclaration = designation.target) { is FirFunction -> setOf(originalDeclaration)