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

FIR IDE: fix getClosestAvailableParentContext

Browse Source 
File could be physical yet the state is `FirModuleResolveStateDepended`
This commit is contained in:
Tianyu Geng
2021-09-13 11:39:35 -07:00
committed by Ilya Kirillov
parent 0ade231898
commit d968b2ba49
2 changed files with 5 additions and 8 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/FirModuleResolveStateDepended.kt
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtLambdaExpression import org.jetbrains.kotlin.psi.KtLambdaExpression
internal class FirModuleResolveStateDepended( internal class FirModuleResolveStateDepended(
private val originalState: FirModuleResolveStateImpl, val originalState: FirModuleResolveStateImpl,
val towerProviderBuiltUponElement: FirTowerContextProvider, val towerProviderBuiltUponElement: FirTowerContextProvider,
private val ktToFirMapping: KtToFirMapping?, private val ktToFirMapping: KtToFirMapping?,
) : FirModuleResolveState() { ) : FirModuleResolveState() {
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt
+4 -7
View File
@@ -102,7 +102,6 @@ object LowLevelFirApiFacadeForResolveOnAir {
place: KtElement, place: KtElement,
): FirTowerContextProvider { ): FirTowerContextProvider {
require(state is FirModuleResolveStateImpl) require(state is FirModuleResolveStateImpl)
require(place.isPhysical)
return if (place is KtFile) { return if (place is KtFile) {
FileTowerProvider(place, onAirGetTowerContextForFile(state, place)) FileTowerProvider(place, onAirGetTowerContextForFile(state, place))
@@ -328,13 +327,11 @@ object LowLevelFirApiFacadeForResolveOnAir {
private class TowerProviderForElementForState(private val state: FirModuleResolveState) : FirTowerContextProvider { private class TowerProviderForElementForState(private val state: FirModuleResolveState) : FirTowerContextProvider {
override fun getClosestAvailableParentContext(ktElement: KtElement): FirTowerDataContext? { override fun getClosestAvailableParentContext(ktElement: KtElement): FirTowerDataContext? {
return if (ktElement.isPhysical) { return if (state is FirModuleResolveStateDepended) {
onAirGetTowerContextProvider(state, ktElement).getClosestAvailableParentContext(ktElement)
} else {
require(state is FirModuleResolveStateDepended) {
"Invalid resolve state ${this::class.simpleName} but have to be ${FirModuleResolveStateDepended::class.simpleName}"
}
state.towerProviderBuiltUponElement.getClosestAvailableParentContext(ktElement) state.towerProviderBuiltUponElement.getClosestAvailableParentContext(ktElement)
?: onAirGetTowerContextProvider(state.originalState, ktElement).getClosestAvailableParentContext(ktElement)
} else {
onAirGetTowerContextProvider(state, ktElement).getClosestAvailableParentContext(ktElement)
} }
} }
} }