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

[FE 1.0] Report errors or warnings for INFERRED_TYPE_VARIABLE_INTO_EMPTY_INTERSECTION depending on previously recorded kind of diagnostic

Browse Source
This commit is contained in:
Victor Petukhov
2022-05-20 13:22:20 +02:00
committed by teamcity
parent 1535ab8eed
commit 73d676d9de
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
+4 -4
View File
@@ -607,12 +607,12 @@ class DiagnosticReporterByTrackingStrategy(
psiKotlinCall.psiCall.calleeExpression?.let { psiKotlinCall.psiCall.calleeExpression?.let {
val typeVariableText = (typeVariable as? TypeVariableFromCallableDescriptor)?.originalTypeParameter?.name?.asString() val typeVariableText = (typeVariable as? TypeVariableFromCallableDescriptor)?.originalTypeParameter?.name?.asString()
?: typeVariable.toString() ?: typeVariable.toString()
val errorFactory = if (error is InferredEmptyIntersectionError)
INFERRED_TYPE_VARIABLE_INTO_EMPTY_INTERSECTION.errorFactory
else INFERRED_TYPE_VARIABLE_INTO_EMPTY_INTERSECTION.warningFactory
trace.reportDiagnosticOnce( trace.reportDiagnosticOnce(
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
INFERRED_TYPE_VARIABLE_INTO_EMPTY_INTERSECTION.on( errorFactory.on(it, typeVariableText, error.incompatibleTypes as Collection<KotlinType>)
context.languageVersionSettings, it, typeVariableText,
error.incompatibleTypes as Collection<KotlinType>
)
) )
} }
} }