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

[FIR] Enable plugin phases if some extensions are registered

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-12-02 10:47:58 +03:00
committed by TeamCityServer
parent 1d32d5c7d8
commit 8c11ea266a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt
+1 -1
View File
@@ -80,7 +80,7 @@ class FirAnalyzerFacade(
override fun runResolution(): List<FirFile> { override fun runResolution(): List<FirFile> {
if (firFiles == null) buildRawFir() if (firFiles == null) buildRawFir()
if (_scopeSession != null) return firFiles!! if (_scopeSession != null) return firFiles!!
val resolveProcessor = FirTotalResolveProcessor(session, enablePluginPhases) val resolveProcessor = FirTotalResolveProcessor(session)
resolveProcessor.process(firFiles!!) resolveProcessor.process(firFiles!!)
_scopeSession = resolveProcessor.scopeSession _scopeSession = resolveProcessor.scopeSession
return firFiles!! return firFiles!!
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt
+7 -2
View File
@@ -9,16 +9,21 @@ import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirFile
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase.* import org.jetbrains.kotlin.fir.declarations.FirResolvePhase.*
import org.jetbrains.kotlin.fir.extensions.extensionService
import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirBodyResolveProcessor import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirBodyResolveProcessor
import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirImplicitTypeBodyResolveProcessor import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirImplicitTypeBodyResolveProcessor
import org.jetbrains.kotlin.fir.resolve.transformers.contracts.FirContractResolveProcessor import org.jetbrains.kotlin.fir.resolve.transformers.contracts.FirContractResolveProcessor
import org.jetbrains.kotlin.fir.resolve.transformers.plugin.* import org.jetbrains.kotlin.fir.resolve.transformers.plugin.*
class FirTotalResolveProcessor(session: FirSession, enablePluginPhases: Boolean = false) { class FirTotalResolveProcessor(session: FirSession) {
val scopeSession: ScopeSession = ScopeSession() val scopeSession: ScopeSession = ScopeSession()
private val processors: List<FirResolveProcessor> = createAllCompilerResolveProcessors(session, scopeSession, enablePluginPhases) private val processors: List<FirResolveProcessor> = createAllCompilerResolveProcessors(
session,
scopeSession,
pluginPhasesEnabled = session.extensionService.registeredExtensionsSize > 0
)
fun process(files: List<FirFile>) { fun process(files: List<FirFile>) {
for (processor in processors) { for (processor in processors) {