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

[FIR] Make FirAnalyzerFacade returns diagnostics grouped by fir file

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-11-03 16:01:42 +03:00
parent dabc259ae8
commit ed0e5adce7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
+1 -1
View File
@@ -339,7 +339,7 @@ object KotlinToJVMBytecodeCompiler {
val firAnalyzerFacade = FirAnalyzerFacade(session, moduleConfiguration.languageVersionSettings, ktFiles) val firAnalyzerFacade = FirAnalyzerFacade(session, moduleConfiguration.languageVersionSettings, ktFiles)
firAnalyzerFacade.runResolution() firAnalyzerFacade.runResolution()
val firDiagnostics = firAnalyzerFacade.runCheckers() val firDiagnostics = firAnalyzerFacade.runCheckers().values.flatten()
AnalyzerWithCompilerReport.reportDiagnostics( AnalyzerWithCompilerReport.reportDiagnostics(
SimpleDiagnostics( SimpleDiagnostics(
firDiagnostics.map { it.toRegularDiagnostic() } firDiagnostics.map { it.toRegularDiagnostic() }
compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt
+4 -4
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.KtFile
class FirAnalyzerFacade(val session: FirSession, val languageVersionSettings: LanguageVersionSettings, val ktFiles: List<KtFile>) { class FirAnalyzerFacade(val session: FirSession, val languageVersionSettings: LanguageVersionSettings, val ktFiles: List<KtFile>) {
private var firFiles: List<FirFile>? = null private var firFiles: List<FirFile>? = null
private var scopeSession: ScopeSession? = null private var scopeSession: ScopeSession? = null
private var collectedDiagnostics: List<FirDiagnostic<*>>? = null private var collectedDiagnostics: Map<FirFile, List<FirDiagnostic<*>>>? = null
private fun buildRawFir() { private fun buildRawFir() {
if (firFiles != null) return if (firFiles != null) return
@@ -52,13 +52,13 @@ class FirAnalyzerFacade(val session: FirSession, val languageVersionSettings: La
} }
@OptIn(ExperimentalStdlibApi::class) @OptIn(ExperimentalStdlibApi::class)
fun runCheckers(): List<FirDiagnostic<*>> { fun runCheckers(): Map<FirFile, List<FirDiagnostic<*>>> {
if (scopeSession == null) runResolution() if (scopeSession == null) runResolution()
if (collectedDiagnostics != null) return collectedDiagnostics!! if (collectedDiagnostics != null) return collectedDiagnostics!!
val collector = FirDiagnosticsCollector.create(session) val collector = FirDiagnosticsCollector.create(session)
collectedDiagnostics = buildList { collectedDiagnostics = buildMap {
for (file in firFiles!!) { for (file in firFiles!!) {
addAll(collector.collectDiagnostics(file)) put(file, collector.collectDiagnostics(file))
} }
} }
return collectedDiagnostics!! return collectedDiagnostics!!