From bb64e43ee13944c7c6e7e37deac6543280b32370 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 19 Feb 2013 15:47:47 +0400 Subject: [PATCH] Better error logging. --- .../resolve/java/resolver/JavaFunctionResolver.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java index 3ff435835e5..e5a092c29ae 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java @@ -229,10 +229,12 @@ public final class JavaFunctionResolver { isReturnTypeOkForOverride(JetTypeChecker.INSTANCE, superFunctionSubstituted, functionDescriptor); if (!paramsOk || !returnTypeOk) { String errorMessage = "Loaded Java method overrides another, but resolved as Kotlin function, doesn't.\n" - + "super function = " + superFunction + "\n" - + "this function = " + functionDescriptor + "\n" - + "this method = " + PsiFormatUtil.getExternalName(method.getPsiMethod()) + "\n" - + "@KotlinSignature = " + method.getSignatureAnnotation().signature(); + + "super function = " + superFunction + "\n" + + "super class = " + superFunction.getContainingDeclaration() + "\n" + + "sub function = " + functionDescriptor + "\n" + + "sub class = " + functionDescriptor.getContainingDeclaration() + "\n" + + "sub method = " + PsiFormatUtil.getExternalName(method.getPsiMethod()) + "\n" + + "@KotlinSignature = " + method.getSignatureAnnotation().signature(); if (ApplicationManager.getApplication().isUnitTestMode()) { throw new IllegalStateException(errorMessage);