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

[FIR IDE] Fix invalid partial resolve of file annotations

Browse Source
This commit is contained in:
Igor Yakovlev
2021-07-19 14:27:02 +02:00
parent e1c8f302a4
commit a4426cd40d
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt
+6 -2
View File
@@ -42,7 +42,7 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui
checkPCE: Boolean, checkPCE: Boolean,
collector: FirTowerDataContextCollector? = null, collector: FirTowerDataContextCollector? = null,
) { ) {
if (firFile.resolvePhase >= FirResolvePhase.IMPORTS) return if (firFile.resolvePhase >= FirResolvePhase.IMPORTS && annotations.all { it.resolveStatus == FirAnnotationResolveStatus.Resolved }) return
moduleFileCache.firFileLockProvider.runCustomResolveUnderLock(firFile, checkPCE) { moduleFileCache.firFileLockProvider.runCustomResolveUnderLock(firFile, checkPCE) {
resolveFileAnnotationsWithoutLock( resolveFileAnnotationsWithoutLock(
firFile = firFile, firFile = firFile,
@@ -65,7 +65,7 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui
scopeSession: ScopeSession, scopeSession: ScopeSession,
collector: FirTowerDataContextCollector? = null, collector: FirTowerDataContextCollector? = null,
) { ) {
if (firFile.resolvePhase >= FirResolvePhase.IMPORTS) return if (firFile.resolvePhase < FirResolvePhase.IMPORTS) {
lazyResolveFileDeclarationWithoutLock( lazyResolveFileDeclarationWithoutLock(
firFile = firFile, firFile = firFile,
moduleFileCache = moduleFileCache, moduleFileCache = moduleFileCache,
@@ -74,7 +74,9 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui
checkPCE = false, checkPCE = false,
collector = collector collector = collector
) )
}
if (!annotations.all { it.resolveStatus == FirAnnotationResolveStatus.Resolved }) {
FirFileAnnotationsResolveTransformer( FirFileAnnotationsResolveTransformer(
firFile = firFile, firFile = firFile,
annotations = annotations, annotations = annotations,
@@ -84,6 +86,8 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui
).transformDeclaration(firFileBuilder.firPhaseRunner) ).transformDeclaration(firFileBuilder.firPhaseRunner)
} }
}
private fun FirDeclaration.isValidForResolve(): Boolean = when (origin) { private fun FirDeclaration.isValidForResolve(): Boolean = when (origin) {
is FirDeclarationOrigin.Source, is FirDeclarationOrigin.Source,
is FirDeclarationOrigin.ImportedFromObject, is FirDeclarationOrigin.ImportedFromObject,