This commit is contained in:
Alexey Kudravtsev
2012-06-18 14:36:56 +04:00
parent ace84254f0
commit 421c5772c1
2 changed files with 7 additions and 3 deletions
@@ -66,8 +66,11 @@ public class HighlightOverridingMethodsHandler extends HighlightUsagesHandlerBas
if (containingClass == null) continue;
for (PsiClass classToAnalyze : classes) {
if (InheritanceUtil.isInheritorOrSelf(classToAnalyze, containingClass, true)) {
addOccurrence(method.getNameIdentifier());
break;
PsiIdentifier identifier = method.getNameIdentifier();
if (identifier != null) {
addOccurrence(identifier);
break;
}
}
}
}
@@ -28,6 +28,7 @@ import com.intellij.openapi.wm.WindowManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
@@ -102,7 +103,7 @@ public abstract class HighlightUsagesHandlerBase<T extends PsiElement> {
public abstract void computeUsages(List<T> targets);
protected void addOccurrence(PsiElement element) {
protected void addOccurrence(@NotNull PsiElement element) {
TextRange range = element.getTextRange();
range = InjectedLanguageManager.getInstance(element.getProject()).injectedToHost(element, range);
myReadUsages.add(range);