From e40c8fff05197ca4b3a5865db83dcf7a33a1d0cb Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Thu, 22 Jun 2017 13:46:12 +0300 Subject: [PATCH] Make resolution status name more precise --- .../org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt | 2 +- .../kotlin/resolve/calls/results/ResolutionStatus.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt index 6b8ae44a4c1..c8edfe81d8e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt @@ -568,7 +568,7 @@ class CandidateResolver( } if (!smartCastResult.isCorrect) { // Error about unstable smart cast reported within checkAndRecordPossibleCast - return UNSTABLE_SMARTCAST_ERROR + return UNSTABLE_SMARTCAST_FOR_RECEIVER_ERROR } } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionStatus.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionStatus.java index ccab2b636a4..ade15f5a0b2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionStatus.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionStatus.java @@ -24,7 +24,7 @@ public enum ResolutionStatus { UNKNOWN_STATUS, UNSAFE_CALL_ERROR, WRONG_NUMBER_OF_TYPE_ARGUMENTS_ERROR, - UNSTABLE_SMARTCAST_ERROR, + UNSTABLE_SMARTCAST_FOR_RECEIVER_ERROR, INVISIBLE_MEMBER_ERROR, NULLABLE_ARGUMENT_TYPE_MISMATCH, OTHER_ERROR, @@ -43,7 +43,7 @@ public enum ResolutionStatus { public static final EnumSet[] SEVERITY_LEVELS = new EnumSet[] { EnumSet.of(UNSAFE_CALL_ERROR), // weakest EnumSet.of(WRONG_NUMBER_OF_TYPE_ARGUMENTS_ERROR), - EnumSet.of(UNSTABLE_SMARTCAST_ERROR), + EnumSet.of(UNSTABLE_SMARTCAST_FOR_RECEIVER_ERROR), EnumSet.of(INVISIBLE_MEMBER_ERROR), EnumSet.of(NULLABLE_ARGUMENT_TYPE_MISMATCH), EnumSet.of(OTHER_ERROR),