From ee78a3a8d8647cfc5d4dac83febe4468114679ce Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 11 Sep 2015 20:25:30 +0200
Subject: [PATCH] diagnostics for null references in IdentifierHighlighterPass
 (EA-72748 - IAE: ReferenceRange.getRanges)

---
 .../codeInsight/daemon/impl/IdentifierHighlighterPass.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
index 7684726ebb9d..7cefa33adf6c 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
@@ -139,6 +139,10 @@ public class IdentifierHighlighterPass extends TextEditorHighlightingPass {
                               ? findUsagesHandler.findReferencesToHighlight(target, scope)
                               : ReferencesSearch.search(target, scope).findAll();
     for (PsiReference psiReference : refs) {
+      if (psiReference == null) {
+        LOG.error("Null reference returned, findUsagesHandler=" + findUsagesHandler + "; target=" + target + " of " + target.getClass());
+        continue;
+      }
       final List<TextRange> textRanges = HighlightUsagesHandler.getRangesToHighlight(psiReference);
       if (detector == null || detector.getReferenceAccess(target, psiReference) == ReadWriteAccessDetector.Access.Read) {
         readRanges.addAll(textRanges);