FIR checker: Separate FirExternalDeclarationChecker as it is
JVM-specific.
This commit is contained in:
committed by
Ilya Kirillov
parent
c3d2ce0c1f
commit
beaeb74a26
+9
-3
@@ -3,17 +3,23 @@
|
|||||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
* 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.checkers.declaration
|
package org.jetbrains.kotlin.fir.analysis.checkers.declaration.jvm
|
||||||
|
|
||||||
import org.jetbrains.kotlin.fir.FirFakeSourceElementKind
|
import org.jetbrains.kotlin.fir.FirFakeSourceElementKind
|
||||||
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
|
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirBasicDeclarationChecker
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirModifierList
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn
|
||||||
import org.jetbrains.kotlin.fir.declarations.*
|
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
|
||||||
|
import org.jetbrains.kotlin.fir.declarations.FirFunction
|
||||||
|
import org.jetbrains.kotlin.fir.declarations.FirProperty
|
||||||
|
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
|
||||||
import org.jetbrains.kotlin.lexer.KtTokens
|
import org.jetbrains.kotlin.lexer.KtTokens
|
||||||
|
|
||||||
object FirExternalDeclarationChecker : FirBasicDeclarationChecker() {
|
// TODO: Move this to different, JVM-specific module?
|
||||||
|
object FirJvmExternalDeclarationChecker : FirBasicDeclarationChecker() {
|
||||||
override fun check(declaration: FirDeclaration, context: CheckerContext, reporter: DiagnosticReporter) {
|
override fun check(declaration: FirDeclaration, context: CheckerContext, reporter: DiagnosticReporter) {
|
||||||
val source = declaration.source ?: return
|
val source = declaration.source ?: return
|
||||||
if (source.kind is FirFakeSourceElementKind) return
|
if (source.kind is FirFakeSourceElementKind) return
|
||||||
@@ -16,3 +16,8 @@ fun FirSessionFactory.FirSessionConfigurator.registerExtendedCommonCheckers() {
|
|||||||
useCheckers(ExtendedExpressionCheckers)
|
useCheckers(ExtendedExpressionCheckers)
|
||||||
useCheckers(ExtendedDeclarationCheckers)
|
useCheckers(ExtendedDeclarationCheckers)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: Move this to different, JVM-specific module?
|
||||||
|
fun FirSessionFactory.FirSessionConfigurator.registerJvmCheckers() {
|
||||||
|
useCheckers(JvmDeclarationCheckers)
|
||||||
|
}
|
||||||
|
|||||||
-1
@@ -18,7 +18,6 @@ object CommonDeclarationCheckers : DeclarationCheckers() {
|
|||||||
FirModifierChecker,
|
FirModifierChecker,
|
||||||
FirConflictsChecker,
|
FirConflictsChecker,
|
||||||
FirConflictingProjectionChecker,
|
FirConflictingProjectionChecker,
|
||||||
FirExternalDeclarationChecker,
|
|
||||||
FirConstDeclarationChecker,
|
FirConstDeclarationChecker,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
+16
@@ -0,0 +1,16 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2021 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.checkers
|
||||||
|
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.*
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.jvm.FirJvmExternalDeclarationChecker
|
||||||
|
|
||||||
|
// TODO: Move this to different, JVM-specific module?
|
||||||
|
object JvmDeclarationCheckers : DeclarationCheckers() {
|
||||||
|
override val basicDeclarationCheckers: Set<FirBasicDeclarationChecker> = setOf(
|
||||||
|
FirJvmExternalDeclarationChecker,
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.fir.analysis.extensions.additionalCheckers
|
|||||||
import org.jetbrains.kotlin.fir.caches.FirCachesFactory
|
import org.jetbrains.kotlin.fir.caches.FirCachesFactory
|
||||||
import org.jetbrains.kotlin.fir.caches.FirThreadUnsafeCachesFactory
|
import org.jetbrains.kotlin.fir.caches.FirThreadUnsafeCachesFactory
|
||||||
import org.jetbrains.kotlin.fir.checkers.registerCommonCheckers
|
import org.jetbrains.kotlin.fir.checkers.registerCommonCheckers
|
||||||
|
import org.jetbrains.kotlin.fir.checkers.registerJvmCheckers
|
||||||
import org.jetbrains.kotlin.fir.extensions.BunchOfRegisteredExtensions
|
import org.jetbrains.kotlin.fir.extensions.BunchOfRegisteredExtensions
|
||||||
import org.jetbrains.kotlin.fir.extensions.extensionService
|
import org.jetbrains.kotlin.fir.extensions.extensionService
|
||||||
import org.jetbrains.kotlin.fir.extensions.registerExtensions
|
import org.jetbrains.kotlin.fir.extensions.registerExtensions
|
||||||
@@ -94,6 +95,7 @@ object FirSessionFactory {
|
|||||||
|
|
||||||
FirSessionConfigurator(this).apply {
|
FirSessionConfigurator(this).apply {
|
||||||
registerCommonCheckers()
|
registerCommonCheckers()
|
||||||
|
registerJvmCheckers()
|
||||||
init()
|
init()
|
||||||
}.configure()
|
}.configure()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user