From 39c409f84c849fb291e0ec890bb40f4fa4ba3770 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 10 Jan 2018 14:21:29 +0300
Subject: [PATCH] call createCustomHandler outside EDT because it parses lazy
 elements sometimes

---
 .../codeInsight/daemon/impl/IdentifierHighlighterPass.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 3bed15b4e94a..2798fa3ec3bc 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
@@ -58,18 +58,17 @@ public class IdentifierHighlighterPass extends TextEditorHighlightingPass {
   private final Collection<TextRange> myReadAccessRanges = Collections.synchronizedList(new ArrayList<TextRange>());
   private final Collection<TextRange> myWriteAccessRanges = Collections.synchronizedList(new ArrayList<TextRange>());
   private final int myCaretOffset;
-  private final HighlightUsagesHandlerBase<PsiElement> myHighlightUsagesHandler;
 
   IdentifierHighlighterPass(@NotNull Project project, @NotNull PsiFile file, @NotNull Editor editor) {
     super(project, editor.getDocument(), false);
     myFile = file;
     myEditor = editor;
     myCaretOffset = myEditor.getCaretModel().getOffset();
-    myHighlightUsagesHandler = HighlightUsagesHandler.createCustomHandler(myEditor, myFile);
   }
 
   @Override
   public void doCollectInformation(@NotNull final ProgressIndicator progress) {
+    HighlightUsagesHandlerBase<PsiElement> myHighlightUsagesHandler = HighlightUsagesHandler.createCustomHandler(myEditor, myFile);
     if (myHighlightUsagesHandler != null) {
       List<PsiElement> targets = myHighlightUsagesHandler.getTargets();
       myHighlightUsagesHandler.computeUsages(targets);