From 850cd190f8126d8a3c46ec0ac35975f572bff881 Mon Sep 17 00:00:00 2001 From: svtk Date: Thu, 24 Nov 2011 16:00:10 +0400 Subject: [PATCH] Exception on incomplete code fixed --- .../org/jetbrains/jet/lang/resolve/OverrideResolver.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java index 161eb5bcd7a..0ea7d1e60aa 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -110,16 +110,17 @@ public class OverrideResolver { Set manyImpl = Sets.newLinkedHashSet(); collectMissingImplementations(classDescriptor, abstractNoImpl, manyImpl); - PsiElement nameIdentifier = klass; + PsiElement nameIdentifier = null; if (klass instanceof JetClass) { nameIdentifier = ((JetClass) klass).getNameIdentifier(); } else if (klass instanceof JetObjectDeclaration) { nameIdentifier = ((JetObjectDeclaration) klass).getNameIdentifier(); } + PsiElement elementToMark = nameIdentifier != null ? nameIdentifier : klass; for (CallableMemberDescriptor memberDescriptor : manyImpl) { - context.getTrace().report(MANY_IMPL_MEMBER_NOT_IMPLEMENTED.on(nameIdentifier, klass, memberDescriptor)); + context.getTrace().report(MANY_IMPL_MEMBER_NOT_IMPLEMENTED.on(elementToMark, klass, memberDescriptor)); break; } @@ -129,7 +130,7 @@ public class OverrideResolver { } for (CallableMemberDescriptor memberDescriptor : abstractNoImpl) { - context.getTrace().report(ABSTRACT_MEMBER_NOT_IMPLEMENTED.on(nameIdentifier, klass, memberDescriptor)); + context.getTrace().report(ABSTRACT_MEMBER_NOT_IMPLEMENTED.on(elementToMark, klass, memberDescriptor)); break; }