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

[LL] Fix platform detection for configuration of checkers

Browse Source 
KT-60318
This commit is contained in:
Pavel Kirpichenkov
2023-07-13 18:17:40 +03:00
committed by teamcity
parent b316aa7d1d
commit 0eef12ea19
1 changed files with 21 additions and 17 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
+21 -17
View File
@@ -28,10 +28,10 @@ import org.jetbrains.kotlin.fir.analysis.jvm.checkers.JvmExpressionCheckers
import org.jetbrains.kotlin.fir.analysis.jvm.checkers.JvmTypeCheckers
import org.jetbrains.kotlin.fir.analysis.native.checkers.NativeDeclarationCheckers
import org.jetbrains.kotlin.fir.extensions.extensionService
import org.jetbrains.kotlin.platform.SimplePlatform
import org.jetbrains.kotlin.platform.jvm.JvmPlatform
import org.jetbrains.kotlin.platform.JsPlatform
import org.jetbrains.kotlin.platform.konan.NativePlatform
import org.jetbrains.kotlin.platform.isJs
import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.jvm.isJvm
import org.jetbrains.kotlin.platform.konan.isNative
internal abstract class AbstractLLFirDiagnosticsCollector(
session: FirSession,
@@ -51,7 +51,7 @@ private object CheckersFactory {
useExtendedCheckers: Boolean
): DiagnosticCollectorComponents {
val module = session.llFirModuleData.ktModule
val platform = module.platform.componentPlatforms.first()
val platform = module.platform
val extensionCheckers = session.extensionService.additionalCheckers
val declarationCheckers = createDeclarationCheckers(useExtendedCheckers, platform, extensionCheckers)
val expressionCheckers = createExpressionCheckers(useExtendedCheckers, platform, extensionCheckers)
@@ -72,7 +72,7 @@ private object CheckersFactory {
private fun createDeclarationCheckers(
useExtendedCheckers: Boolean,
platform: SimplePlatform,
platform: TargetPlatform,
extensionCheckers: List<FirAdditionalCheckersExtension>
): DeclarationCheckers {
return if (useExtendedCheckers) {
@@ -80,10 +80,10 @@ private object CheckersFactory {
} else {
createDeclarationCheckers {
add(CommonDeclarationCheckers)
when (platform) {
is JvmPlatform -> add(JvmDeclarationCheckers)
is JsPlatform -> add(JsDeclarationCheckers)
is NativePlatform -> add(NativeDeclarationCheckers)
when {
platform.isJvm() -> add(JvmDeclarationCheckers)
platform.isJs() -> add(JsDeclarationCheckers)
platform.isNative() -> add(NativeDeclarationCheckers)
else -> {}
}
addAll(extensionCheckers.map { it.declarationCheckers })
@@ -93,7 +93,7 @@ private object CheckersFactory {
private fun createExpressionCheckers(
useExtendedCheckers: Boolean,
platform: SimplePlatform,
platform: TargetPlatform,
extensionCheckers: List<FirAdditionalCheckersExtension>
): ExpressionCheckers {
return if (useExtendedCheckers) {
@@ -101,9 +101,9 @@ private object CheckersFactory {
} else {
createExpressionCheckers {
add(CommonExpressionCheckers)
when (platform) {
is JvmPlatform -> add(JvmExpressionCheckers)
is JsPlatform -> add(JsExpressionCheckers)
when {
platform.isJvm() -> add(JvmExpressionCheckers)
platform.isJs() -> add(JsExpressionCheckers)
else -> {
}
}
@@ -112,12 +112,16 @@ private object CheckersFactory {
}
}
private fun createTypeCheckers(useExtendedCheckers: Boolean, platform: SimplePlatform, extensionCheckers: List<FirAdditionalCheckersExtension>): TypeCheckers {
private fun createTypeCheckers(
useExtendedCheckers: Boolean,
platform: TargetPlatform,
extensionCheckers: List<FirAdditionalCheckersExtension>,
): TypeCheckers {
if (useExtendedCheckers) return ExtendedTypeCheckers
return createTypeCheckers {
add(CommonTypeCheckers)
when (platform) {
is JvmPlatform -> add(JvmTypeCheckers)
when {
platform.isJvm() -> add(JvmTypeCheckers)
else -> {}
}
addAll(extensionCheckers.map { it.typeCheckers })