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

FIR: Throw if source is null in DiagnosticReporter.reportOn ^KT-55284 Fixed

Browse Source
This commit is contained in:
Kirill Rakhman
2023-01-04 13:42:37 +01:00
committed by Space Team
parent c3bdcc6b0d
commit a7edf5b83e
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/KtDiagnosticReportHelpers.kt
+8 -5
View File
@@ -15,7 +15,7 @@ fun DiagnosticReporter.reportOn(
context: DiagnosticContext, context: DiagnosticContext,
positioningStrategy: AbstractSourceElementPositioningStrategy? = null positioningStrategy: AbstractSourceElementPositioningStrategy? = null
) { ) {
source?.let { report(factory.on(it, positioningStrategy), context) } report(factory.on(requireSourceNotNull(source), positioningStrategy), context)
} }
fun <A : Any> DiagnosticReporter.reportOn( fun <A : Any> DiagnosticReporter.reportOn(
@@ -25,7 +25,7 @@ fun <A : Any> DiagnosticReporter.reportOn(
context: DiagnosticContext, context: DiagnosticContext,
positioningStrategy: AbstractSourceElementPositioningStrategy? = null positioningStrategy: AbstractSourceElementPositioningStrategy? = null
) { ) {
source?.let { report(factory.on(it, a, positioningStrategy), context) } report(factory.on(requireSourceNotNull(source), a, positioningStrategy), context)
} }
fun <A : Any, B : Any> DiagnosticReporter.reportOn( fun <A : Any, B : Any> DiagnosticReporter.reportOn(
@@ -36,7 +36,7 @@ fun <A : Any, B : Any> DiagnosticReporter.reportOn(
context: DiagnosticContext, context: DiagnosticContext,
positioningStrategy: AbstractSourceElementPositioningStrategy? = null positioningStrategy: AbstractSourceElementPositioningStrategy? = null
) { ) {
source?.let { report(factory.on(it, a, b, positioningStrategy), context) } report(factory.on(requireSourceNotNull(source), a, b, positioningStrategy), context)
} }
fun <A : Any, B : Any, C : Any> DiagnosticReporter.reportOn( fun <A : Any, B : Any, C : Any> DiagnosticReporter.reportOn(
@@ -48,7 +48,7 @@ fun <A : Any, B : Any, C : Any> DiagnosticReporter.reportOn(
context: DiagnosticContext, context: DiagnosticContext,
positioningStrategy: AbstractSourceElementPositioningStrategy? = null positioningStrategy: AbstractSourceElementPositioningStrategy? = null
) { ) {
source?.let { report(factory.on(it, a, b, c, positioningStrategy), context) } report(factory.on(requireSourceNotNull(source), a, b, c, positioningStrategy), context)
} }
fun <A : Any, B : Any, C : Any, D : Any> DiagnosticReporter.reportOn( fun <A : Any, B : Any, C : Any, D : Any> DiagnosticReporter.reportOn(
@@ -61,9 +61,12 @@ fun <A : Any, B : Any, C : Any, D : Any> DiagnosticReporter.reportOn(
context: DiagnosticContext, context: DiagnosticContext,
positioningStrategy: AbstractSourceElementPositioningStrategy? = null positioningStrategy: AbstractSourceElementPositioningStrategy? = null
) { ) {
source?.let { report(factory.on(it, a, b, c, d, positioningStrategy), context) } report(factory.on(requireSourceNotNull(source), a, b, c, d, positioningStrategy), context)
} }
private fun requireSourceNotNull(source: AbstractKtSourceElement?): AbstractKtSourceElement =
requireNotNull(source) { "source must not be null" }
fun DiagnosticReporter.reportOn( fun DiagnosticReporter.reportOn(
source: AbstractKtSourceElement?, source: AbstractKtSourceElement?,
factory: KtDiagnosticFactoryForDeprecation0, factory: KtDiagnosticFactoryForDeprecation0,