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

[FIR JS] Add the dynamic type unsupported checker

Browse Source
This commit is contained in:
Nikolay Lunyak
2022-04-02 00:59:02 +03:00
committed by teamcity
parent 624728e5c7
commit c2cecb2818
4 changed files with 74 additions and 4 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
+31 -4
View File
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.analysis.checkers.declaration.ComposedDeclaratio
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.DeclarationCheckers
import org.jetbrains.kotlin.fir.analysis.checkers.expression.ComposedExpressionCheckers
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.components.*
@@ -21,6 +22,7 @@ import org.jetbrains.kotlin.fir.analysis.js.checkers.JsDeclarationCheckers
import org.jetbrains.kotlin.fir.analysis.js.checkers.JsExpressionCheckers
import org.jetbrains.kotlin.fir.analysis.jvm.checkers.JvmDeclarationCheckers
import org.jetbrains.kotlin.fir.analysis.jvm.checkers.JvmExpressionCheckers
import org.jetbrains.kotlin.fir.analysis.jvm.checkers.JvmTypeCheckers
import org.jetbrains.kotlin.platform.SimplePlatform
import org.jetbrains.kotlin.platform.jvm.JvmPlatform
import org.jetbrains.kotlin.platform.js.JsPlatform
@@ -46,7 +48,7 @@ private object CheckersFactory {
val platform = module.platform.componentPlatforms.first()
val declarationCheckers = createDeclarationCheckers(useExtendedCheckers, platform)
val expressionCheckers = createExpressionCheckers(useExtendedCheckers, platform)
val typeCheckers = createTypeCheckers(useExtendedCheckers)
val typeCheckers = createTypeCheckers(useExtendedCheckers, platform)
@OptIn(ExperimentalStdlibApi::class)
return buildList {
@@ -55,7 +57,7 @@ private object CheckersFactory {
}
add(DeclarationCheckersDiagnosticComponent(session, reporter, declarationCheckers))
add(ExpressionCheckersDiagnosticComponent(session, reporter, expressionCheckers))
typeCheckers?.let { add(TypeCheckersDiagnosticComponent(session, reporter, it)) }
add(TypeCheckersDiagnosticComponent(session, reporter, typeCheckers))
add(ControlFlowAnalysisDiagnosticComponent(session, reporter, declarationCheckers))
}
}
@@ -93,8 +95,18 @@ private object CheckersFactory {
}
}
private fun createTypeCheckers(useExtendedCheckers: Boolean): TypeCheckers? =
if (useExtendedCheckers) ExtendedTypeCheckers else CommonTypeCheckers
private fun createTypeCheckers(useExtendedCheckers: Boolean, platform: SimplePlatform): TypeCheckers =
if (useExtendedCheckers) {
ExtendedTypeCheckers
} else {
createTypeCheckers {
add(CommonTypeCheckers)
when (platform) {
is JvmPlatform -> add(JvmTypeCheckers)
else -> {}
}
}
}
@OptIn(ExperimentalStdlibApi::class)
@@ -128,4 +140,19 @@ private object CheckersFactory {
}
}
}
@OptIn(ExperimentalStdlibApi::class)
private inline fun createTypeCheckers(
createTypeCheckers: MutableList<TypeCheckers>.() -> Unit
): TypeCheckers = createTypeCheckers(buildList(createTypeCheckers))
@OptIn(CheckersComponentInternal::class)
private fun createTypeCheckers(typeCheckers: List<TypeCheckers>): TypeCheckers {
return when (typeCheckers.size) {
1 -> typeCheckers.single()
else -> ComposedTypeCheckers().apply {
typeCheckers.forEach(::register)
}
}
}
}