From 6678b8c755676125f2b97a1d0eb0ea071ce3b4b4 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Sat, 12 May 2012 20:23:17 +0400 Subject: [PATCH] NPE --- .../daemon/impl/JavaLineMarkerProvider.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java index df86eee27b19..a351c62ddcb4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java @@ -180,13 +180,11 @@ public class JavaLineMarkerProvider implements LineMarkerProvider, DumbAware { } private static boolean isRecursiveMethodCall(@NotNull PsiMethodCallExpression methodCall){ - final PsiMethod referencedMethod = (PsiMethod)methodCall.getMethodExpression().resolve(); + PsiMethod referencedMethod = methodCall.resolveMethod(); - if (referencedMethod == null){ - return false; - } - - return referencedMethod.getTextRange().contains(methodCall.getTextRange()); + TextRange rmRange = referencedMethod == null ? null : referencedMethod.getTextRange(); + int mcOffset = methodCall.getTextRange().getStartOffset(); + return rmRange != null && rmRange.contains(mcOffset); } private static void collectInheritingClasses(PsiClass aClass, Collection result) {