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

Make resolution status name more precise

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2017-06-22 13:46:12 +03:00
parent 7a9e1b2b1d
commit e40c8fff05
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt
+1 -1
View File
@@ -568,7 +568,7 @@ class CandidateResolver(
} }
if (!smartCastResult.isCorrect) { if (!smartCastResult.isCorrect) {
// Error about unstable smart cast reported within checkAndRecordPossibleCast // Error about unstable smart cast reported within checkAndRecordPossibleCast
return UNSTABLE_SMARTCAST_ERROR return UNSTABLE_SMARTCAST_FOR_RECEIVER_ERROR
} }
} }
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionStatus.java
+2 -2
View File
@@ -24,7 +24,7 @@ public enum ResolutionStatus {
UNKNOWN_STATUS, UNKNOWN_STATUS,
UNSAFE_CALL_ERROR, UNSAFE_CALL_ERROR,
WRONG_NUMBER_OF_TYPE_ARGUMENTS_ERROR, WRONG_NUMBER_OF_TYPE_ARGUMENTS_ERROR,
UNSTABLE_SMARTCAST_ERROR, UNSTABLE_SMARTCAST_FOR_RECEIVER_ERROR,
INVISIBLE_MEMBER_ERROR, INVISIBLE_MEMBER_ERROR,
NULLABLE_ARGUMENT_TYPE_MISMATCH, NULLABLE_ARGUMENT_TYPE_MISMATCH,
OTHER_ERROR, OTHER_ERROR,
@@ -43,7 +43,7 @@ public enum ResolutionStatus {
public static final EnumSet<ResolutionStatus>[] SEVERITY_LEVELS = new EnumSet[] { public static final EnumSet<ResolutionStatus>[] SEVERITY_LEVELS = new EnumSet[] {
EnumSet.of(UNSAFE_CALL_ERROR), // weakest EnumSet.of(UNSAFE_CALL_ERROR), // weakest
EnumSet.of(WRONG_NUMBER_OF_TYPE_ARGUMENTS_ERROR), 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(INVISIBLE_MEMBER_ERROR),
EnumSet.of(NULLABLE_ARGUMENT_TYPE_MISMATCH), EnumSet.of(NULLABLE_ARGUMENT_TYPE_MISMATCH),
EnumSet.of(OTHER_ERROR), EnumSet.of(OTHER_ERROR),