From a9dedab4810fb70011196a2370e4890fdf361076 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Wed, 1 Feb 2012 17:24:25 +0400 Subject: [PATCH] better diag in JavaDescriptorResolver --- .../jet/lang/resolve/java/JavaDescriptorResolver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 1d03278c8fb..ad862bc5bb0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -1222,7 +1222,7 @@ public class JavaDescriptorResolver { } @Nullable - private FunctionDescriptor resolveMethodToFunctionDescriptor(ClassOrNamespaceDescriptor owner, PsiClass psiClass, TypeSubstitutor typeSubstitutorForGenericSuperclasses, PsiMethodWrapper method) { + private FunctionDescriptor resolveMethodToFunctionDescriptor(ClassOrNamespaceDescriptor owner, final PsiClass psiClass, TypeSubstitutor typeSubstitutorForGenericSuperclasses, final PsiMethodWrapper method) { PsiType returnType = method.getReturnType(); if (returnType == null) { @@ -1329,7 +1329,7 @@ public class JavaDescriptorResolver { return typeParameter.descriptor; } } - throw new IllegalStateException("unresolved PsiTypeParameter: " + psiTypeParameter.getName()); // TODO: report properly + throw new IllegalStateException("unresolved PsiTypeParameter " + psiTypeParameter.getName() + " in method " + method.getName() + " in class " + psiClass.getQualifiedName()); // TODO: report properly } @NotNull