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

Rework error reporting for fake call resolution

Browse Source 
Move diagnostic creation to one place
This commit is contained in:
Denis Zharkov
2016-02-01 10:55:54 +03:00
parent 9b3f557337
commit 829a5639f1
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DestructuringDeclarationResolver.kt
-6
View File
@@ -64,12 +64,6 @@ class DestructuringDeclarationResolver(
context.trace.report(Errors.COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH.on(reportErrorsOn, componentName, componentType, expectedType))
}
}
else if (results.isAmbiguity) {
context.trace.report(Errors.COMPONENT_FUNCTION_AMBIGUITY.on(reportErrorsOn, componentName, results.getResultingCalls()))
}
else {
context.trace.report(Errors.COMPONENT_FUNCTION_MISSING.on(reportErrorsOn, componentName, receiver.getType()))
}
if (componentType == null) {
componentType = ErrorUtils.createErrorType("$componentName() return type")
}
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FakeCallResolver.kt
+20 -7
View File
@@ -100,14 +100,27 @@ class FakeCallResolver(
!isFakeKey
}, true)
}
if (hasUnreportedError && reportErrorsOn != null) {
when (callKind) {
FakeCallKind.ITERATOR -> context.trace.report(Errors.ITERATOR_MISSING.on(reportErrorsOn))
FakeCallKind.COMPONENT ->
if (receiver != null) {
context.trace.report(Errors.COMPONENT_FUNCTION_MISSING.on(reportErrorsOn, name, receiver.type))
val resolutionResults = result.second
if ((!resolutionResults.isSuccess || hasUnreportedError) && reportErrorsOn != null) {
val diagnostic = when (callKind) {
FakeCallKind.ITERATOR ->
when {
resolutionResults.isAmbiguity -> Errors.ITERATOR_AMBIGUITY.on(reportErrorsOn, resolutionResults.resultingCalls)
else -> Errors.ITERATOR_MISSING.on(reportErrorsOn)
}
FakeCallKind.OTHER -> {}
FakeCallKind.COMPONENT ->
when {
resolutionResults.isAmbiguity -> Errors.COMPONENT_FUNCTION_AMBIGUITY.on(
reportErrorsOn, name, resolutionResults.resultingCalls)
receiver != null -> Errors.COMPONENT_FUNCTION_MISSING.on(reportErrorsOn, name, receiver.type)
else -> null
}
FakeCallKind.OTHER -> null
}
if (diagnostic != null) {
context.trace.report(diagnostic)
}
}
return result
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java
-8
View File
@@ -90,14 +90,6 @@ public class ForLoopConventionsChecker {
NEXT_AMBIGUITY, NEXT_MISSING, NEXT_NONE_APPLICABLE,
LOOP_RANGE_NEXT_RESOLVED_CALL);
}
else {
if (iteratorResolutionResults.isAmbiguity()) {
context.trace.report(ITERATOR_AMBIGUITY.on(loopRangeExpression, iteratorResolutionResults.getResultingCalls()));
}
else {
context.trace.report(ITERATOR_MISSING.on(loopRangeExpression));
}
}
return null;
}