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

K2 checkers: separate report committer from other diagnostic components

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-07-21 15:21:27 +02:00
committed by Space
parent eba0e94429
commit 78da5907c8
12 changed files with 55 additions and 33 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/diagnostics/AbstractFirIdeDiagnosticsCollector.kt
+4 -3
View File
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.fir.analysis.checkers.expression.ExpressionCheckers
import org.jetbrains.kotlin.fir.analysis.checkers.type.ComposedTypeCheckers
import org.jetbrains.kotlin.fir.analysis.checkers.type.TypeCheckers
import org.jetbrains.kotlin.fir.analysis.collectors.AbstractDiagnosticCollector
import org.jetbrains.kotlin.fir.analysis.collectors.DiagnosticCollectorComponents
import org.jetbrains.kotlin.fir.analysis.collectors.components.*
import org.jetbrains.kotlin.fir.analysis.extensions.FirAdditionalCheckersExtension
import org.jetbrains.kotlin.fir.analysis.extensions.additionalCheckers
@@ -46,7 +47,7 @@ private object CheckersFactory {
session: FirSession,
reporter: DiagnosticReporter,
useExtendedCheckers: Boolean
): List<AbstractDiagnosticCollectorComponent> {
): DiagnosticCollectorComponents {
val module = session.firKtModuleBasedModuleData.ktModule
val platform = module.platform.componentPlatforms.first()
val extensionCheckers = session.extensionService.additionalCheckers
@@ -54,7 +55,7 @@ private object CheckersFactory {
val expressionCheckers = createExpressionCheckers(useExtendedCheckers, platform, extensionCheckers)
val typeCheckers = createTypeCheckers(useExtendedCheckers, platform, extensionCheckers)
return buildList {
val regularComponents = buildList {
if (!useExtendedCheckers) {
add(ErrorNodeDiagnosticCollectorComponent(session, reporter))
}
@@ -62,8 +63,8 @@ private object CheckersFactory {
add(ExpressionCheckersDiagnosticComponent(session, reporter, expressionCheckers))
add(TypeCheckersDiagnosticComponent(session, reporter, typeCheckers))
add(ControlFlowAnalysisDiagnosticComponent(session, reporter, declarationCheckers))
add(ReportCommitterDiagnosticComponent(session, reporter))
}
return DiagnosticCollectorComponents(regularComponents, ReportCommitterDiagnosticComponent(session, reporter))
}
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt
+7 -4
View File
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir.Persisten
import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir.PersistentCheckerContextFactory
import org.jetbrains.kotlin.fir.FirElement
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.analysis.collectors.components.AbstractDiagnosticCollectorComponent
import org.jetbrains.kotlin.fir.analysis.collectors.DiagnosticCollectorComponents
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.resolve.SessionHolderImpl
import org.jetbrains.kotlin.name.StandardClassIds
@@ -44,7 +44,7 @@ internal class SingleNonLocalDeclarationDiagnosticRetriever(
private class Visitor(
private val structureElementDeclaration: FirDeclaration,
context: CheckerContext,
components: List<AbstractDiagnosticCollectorComponent>
components: DiagnosticCollectorComponents
) : LLFirDiagnosticVisitor(context, components) {
private var insideAlwaysVisitableDeclarations = 0
@@ -61,7 +61,10 @@ internal class SingleNonLocalDeclarationDiagnosticRetriever(
return when {
structureElementDeclaration !is FirRegularClass -> true
structureElementDeclaration == declaration -> true
declaration.hasAnnotation(StandardClassIds.Annotations.Suppress) -> true
declaration.hasAnnotation(StandardClassIds.Annotations.Suppress) -> {
useRegularComponents = false
true
}
else -> false
}
}
@@ -104,7 +107,7 @@ internal object FileDiagnosticRetriever : FileStructureElementDiagnosticRetrieve
}
private class Visitor(
components: List<AbstractDiagnosticCollectorComponent>,
components: DiagnosticCollectorComponents,
moduleComponents: LLFirModuleResolveComponents,
) : LLFirDiagnosticVisitor(
PersistentCheckerContextFactory.createEmptyPersistenceCheckerContext(
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticsCollector.kt
+2 -2
View File
@@ -6,9 +6,9 @@
package org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics
import org.jetbrains.kotlin.fir.analysis.collectors.CheckerRunningDiagnosticCollectorVisitor
import org.jetbrains.kotlin.fir.analysis.collectors.components.AbstractDiagnosticCollectorComponent
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir.LLFirStructureElementDiagnosticsCollector
import org.jetbrains.kotlin.fir.analysis.collectors.DiagnosticCollectorComponents
internal class FileStructureElementDiagnosticsCollector private constructor(private val useExtendedCheckers: Boolean) {
companion object {
@@ -18,7 +18,7 @@ internal class FileStructureElementDiagnosticsCollector private constructor(priv
fun collectForStructureElement(
firDeclaration: FirDeclaration,
createVisitor: (components: List<AbstractDiagnosticCollectorComponent>) -> CheckerRunningDiagnosticCollectorVisitor,
createVisitor: (components: DiagnosticCollectorComponents) -> CheckerRunningDiagnosticCollectorVisitor,
): FileStructureElementDiagnosticList {
val reporter = LLFirDiagnosticReporter()
val collector = LLFirStructureElementDiagnosticsCollector(
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/LLFirDiagnosticVisitor.kt
+12 -6
View File
@@ -8,16 +8,18 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics
import org.jetbrains.kotlin.fir.FirElement
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.analysis.collectors.CheckerRunningDiagnosticCollectorVisitor
import org.jetbrains.kotlin.fir.analysis.collectors.components.AbstractDiagnosticCollectorComponent
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkCanceled
import org.jetbrains.kotlin.fir.analysis.collectors.DiagnosticCollectorComponents
internal open class LLFirDiagnosticVisitor(
context: CheckerContext,
components: List<AbstractDiagnosticCollectorComponent>,
components: DiagnosticCollectorComponents,
) : CheckerRunningDiagnosticCollectorVisitor(context, components) {
private val beforeElementDiagnosticCollectionHandler = context.session.beforeElementDiagnosticCollectionHandler
protected var useRegularComponents = true
override fun visitNestedElements(element: FirElement) {
if (element is FirDeclaration) {
beforeElementDiagnosticCollectionHandler?.beforeGoingNestedDeclaration(element, context)
@@ -26,10 +28,14 @@ internal open class LLFirDiagnosticVisitor(
}
override fun checkElement(element: FirElement) {
beforeElementDiagnosticCollectionHandler?.beforeCollectingForElement(element)
components.forEach {
checkCanceled()
element.accept(it, context)
if (useRegularComponents) {
beforeElementDiagnosticCollectionHandler?.beforeCollectingForElement(element)
components.regularComponents.forEach {
checkCanceled()
element.accept(it, context)
}
}
checkCanceled()
element.accept(components.reportCommitter, context)
}
}
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/fir/LLFirStructureElementDiagnosticsCollector.kt
+3 -3
View File
@@ -7,18 +7,18 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.analysis.collectors.CheckerRunningDiagnosticCollectorVisitor
import org.jetbrains.kotlin.fir.analysis.collectors.components.AbstractDiagnosticCollectorComponent
import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.AbstractLLFirDiagnosticsCollector
import org.jetbrains.kotlin.fir.analysis.collectors.DiagnosticCollectorComponents
internal class LLFirStructureElementDiagnosticsCollector(
session: FirSession,
private val doCreateVisitor: (components: List<AbstractDiagnosticCollectorComponent>) -> CheckerRunningDiagnosticCollectorVisitor,
private val doCreateVisitor: (components: DiagnosticCollectorComponents) -> CheckerRunningDiagnosticCollectorVisitor,
useExtendedCheckers: Boolean,
) : AbstractLLFirDiagnosticsCollector(
session,
useExtendedCheckers,
) {
override fun createVisitor(components: List<AbstractDiagnosticCollectorComponent>): CheckerRunningDiagnosticCollectorVisitor {
override fun createVisitor(components: DiagnosticCollectorComponents): CheckerRunningDiagnosticCollectorVisitor {
return doCreateVisitor(components)
}
}
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollector.kt
+2 -2
View File
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.StandardClassIds
abstract class AbstractDiagnosticCollector(
override val session: FirSession,
override val scopeSession: ScopeSession = ScopeSession(),
protected val createComponents: (DiagnosticReporter) -> List<AbstractDiagnosticCollectorComponent>,
protected val createComponents: (DiagnosticReporter) -> DiagnosticCollectorComponents,
) : SessionHolder {
fun collectDiagnostics(firDeclaration: FirDeclaration, reporter: DiagnosticReporter) {
val components = createComponents(reporter)
@@ -31,7 +31,7 @@ abstract class AbstractDiagnosticCollector(
firDeclaration.accept(visitor, null)
}
protected abstract fun createVisitor(components: List<AbstractDiagnosticCollectorComponent>): CheckerRunningDiagnosticCollectorVisitor
protected abstract fun createVisitor(components: DiagnosticCollectorComponents): CheckerRunningDiagnosticCollectorVisitor
companion object {
const val SUPPRESS_ALL_INFOS = "infos"
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/CheckerRunningDiagnosticCollectorVisitor.kt
+4 -5
View File
@@ -13,19 +13,18 @@ import org.jetbrains.kotlin.fir.declarations.FirFile
open class CheckerRunningDiagnosticCollectorVisitor(
context: CheckerContext,
protected val components: List<AbstractDiagnosticCollectorComponent>
protected val components: DiagnosticCollectorComponents
) : AbstractDiagnosticCollectorVisitor(context) {
override fun checkElement(element: FirElement) {
components.forEach {
components.regularComponents.forEach {
element.accept(it, context)
}
element.accept(components.reportCommitter, context)
}
override fun onDeclarationExit(declaration: FirDeclaration) {
if (declaration !is FirFile) return
components.forEach {
it.endOfFile(declaration)
}
components.reportCommitter.endOfFile(declaration)
}
}
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/DiagnosticCollectorComponents.kt
+14
View File
@@ -0,0 +1,14 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.analysis.collectors
import org.jetbrains.kotlin.fir.analysis.collectors.components.AbstractDiagnosticCollectorComponent
import org.jetbrains.kotlin.fir.analysis.collectors.components.ReportCommitterDiagnosticComponent
class DiagnosticCollectorComponents(
val regularComponents: List<AbstractDiagnosticCollectorComponent>,
val reportCommitter: ReportCommitterDiagnosticComponent
)
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/SimpleDiagnosticsCollector.kt
+2 -2
View File
@@ -15,9 +15,9 @@ import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculatorForFull
class SimpleDiagnosticsCollector(
session: FirSession,
scopeSession: ScopeSession,
createComponents: (DiagnosticReporter) -> List<AbstractDiagnosticCollectorComponent>,
createComponents: (DiagnosticReporter) -> DiagnosticCollectorComponents,
) : AbstractDiagnosticCollector(session, scopeSession, createComponents) {
override fun createVisitor(components: List<AbstractDiagnosticCollectorComponent>): CheckerRunningDiagnosticCollectorVisitor {
override fun createVisitor(components: DiagnosticCollectorComponents): CheckerRunningDiagnosticCollectorVisitor {
return CheckerRunningDiagnosticCollectorVisitor(
MutableCheckerContext(
this,
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/AbstractDiagnosticCollectorComponent.kt
-2
View File
@@ -23,6 +23,4 @@ abstract class AbstractDiagnosticCollectorComponent(
val source = element.source ?: return
reporter.checkAndCommitReportsOn(source, context)
}
open fun endOfFile(file: FirFile) {}
}
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/DiagnosticComponentsFactory.kt
+4 -3
View File
@@ -7,17 +7,18 @@ package org.jetbrains.kotlin.fir.analysis.collectors.components
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.fir.analysis.collectors.DiagnosticCollectorComponents
object DiagnosticComponentsFactory {
fun createAllDiagnosticComponents(session: FirSession, reporter: DiagnosticReporter): List<AbstractDiagnosticCollectorComponent> {
return listOf(
fun createAllDiagnosticComponents(session: FirSession, reporter: DiagnosticReporter): DiagnosticCollectorComponents {
val regularComponents = listOf(
DeclarationCheckersDiagnosticComponent(session, reporter),
ExpressionCheckersDiagnosticComponent(session, reporter),
TypeCheckersDiagnosticComponent(session, reporter),
ErrorNodeDiagnosticCollectorComponent(session, reporter),
ControlFlowAnalysisDiagnosticComponent(session, reporter),
ReportCommitterDiagnosticComponent(session, reporter)
)
return DiagnosticCollectorComponents(regularComponents, ReportCommitterDiagnosticComponent(session, reporter))
}
}
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ReportCommiterDiagnosticComponent.kt
+1 -1
View File
@@ -19,7 +19,7 @@ class ReportCommitterDiagnosticComponent(
checkAndCommitReportsOn(element, data)
}
override fun endOfFile(file: FirFile) {
fun endOfFile(file: FirFile) {
checkAndCommitReportsOn(file, null)
}
}