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

[NI] Refactor UnstableSmartCast diagnostic

Browse Source 
Split diagnostic classes for unstable smartcast with different resolution applicability.

^KT-36264 Fixed
This commit is contained in:
Pavel Kirpichenkov
2020-02-13 13:13:55 +03:00
parent 15d744c3da
commit 5d6d287faa
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
+2 -1
View File
@@ -121,7 +121,8 @@ class DiagnosticReporterByTrackingStrategy(
override fun onCallArgument(callArgument: KotlinCallArgument, diagnostic: KotlinCallDiagnostic) { override fun onCallArgument(callArgument: KotlinCallArgument, diagnostic: KotlinCallDiagnostic) {
when (diagnostic.javaClass) { when (diagnostic.javaClass) {
SmartCastDiagnostic::class.java -> reportSmartCast(diagnostic as SmartCastDiagnostic) SmartCastDiagnostic::class.java -> reportSmartCast(diagnostic as SmartCastDiagnostic)
UnstableSmartCast::class.java -> reportUnstableSmartCast(diagnostic as UnstableSmartCast) UnstableSmartCastDiagnosticError::class.java,
UnstableSmartCastResolutionError::class.java -> reportUnstableSmartCast(diagnostic as UnstableSmartCast)
TooManyArguments::class.java -> { TooManyArguments::class.java -> {
trace.reportTrailingLambdaErrorOr(callArgument.psiExpression) { expr -> trace.reportTrailingLambdaErrorOr(callArgument.psiExpression) { expr ->
TOO_MANY_ARGUMENTS.on(expr, (diagnostic as TooManyArguments).descriptor) TOO_MANY_ARGUMENTS.on(expr, (diagnostic as TooManyArguments).descriptor)
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/KotlinCallDiagnostics.kt
+15 -4
View File
@@ -139,7 +139,7 @@ class SmartCastDiagnostic(
override fun report(reporter: DiagnosticReporter) = reporter.onCallArgument(argument, this) override fun report(reporter: DiagnosticReporter) = reporter.onCallArgument(argument, this)
} }
class UnstableSmartCast private constructor( sealed class UnstableSmartCast(
val argument: ExpressionKotlinCallArgument, val argument: ExpressionKotlinCallArgument,
val targetType: UnwrappedType, val targetType: UnwrappedType,
applicability: ResolutionCandidateApplicability, applicability: ResolutionCandidateApplicability,
@@ -150,14 +150,25 @@ class UnstableSmartCast private constructor(
operator fun invoke( operator fun invoke(
argument: ExpressionKotlinCallArgument, argument: ExpressionKotlinCallArgument,
targetType: UnwrappedType, targetType: UnwrappedType,
isReceiver: Boolean = false, isReceiver: Boolean = false, // for reproducing OI behaviour
): UnstableSmartCast { ): UnstableSmartCast {
val applicability = if (isReceiver) MAY_THROW_RUNTIME_ERROR else RESOLVED_WITH_ERROR return if (isReceiver)
return UnstableSmartCast(argument, targetType, applicability) UnstableSmartCastResolutionError(argument, targetType)
else UnstableSmartCastDiagnosticError(argument, targetType)
} }
} }
} }
class UnstableSmartCastResolutionError(
argument: ExpressionKotlinCallArgument,
targetType: UnwrappedType,
) : UnstableSmartCast(argument, targetType, MAY_THROW_RUNTIME_ERROR)
class UnstableSmartCastDiagnosticError(
argument: ExpressionKotlinCallArgument,
targetType: UnwrappedType,
) : UnstableSmartCast(argument, targetType, RESOLVED_WITH_ERROR)
class UnsafeCallError(val receiver: SimpleKotlinCallArgument) : KotlinCallDiagnostic(MAY_THROW_RUNTIME_ERROR) { class UnsafeCallError(val receiver: SimpleKotlinCallArgument) : KotlinCallDiagnostic(MAY_THROW_RUNTIME_ERROR) {
override fun report(reporter: DiagnosticReporter) = reporter.onCallReceiver(receiver, this) override fun report(reporter: DiagnosticReporter) = reporter.onCallReceiver(receiver, this)
} }