From 8d9afa26221663e81f62c0f37398e5397c8880c6 Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Mon, 6 Aug 2018 15:44:15 +0300 Subject: [PATCH] get rid of DaemonCodeAnalyzer#updateVisibleHighlighters usages --- .../quickfix/BringVariableIntoScopeFix.java | 3 --- .../api/impls/MethodParameterInfoHandler.java | 4 +--- .../intellij/codeInsight/TargetElementUtil.java | 17 +++-------------- .../hint/api/impls/XmlParameterInfoHandler.java | 2 -- 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java index 69e257b5c708..c34329a0c4f1 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java @@ -15,7 +15,6 @@ */ package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.codeInsight.intention.IntentionAction; @@ -149,8 +148,6 @@ public class BringVariableIntoScopeFix implements IntentionAction { if (HighlightControlFlowUtil.checkVariableInitializedBeforeUsage(myUnresolvedReference, addedVar, new THashMap<>(), file) != null) { initialize(addedVar); } - - DaemonCodeAnalyzer.getInstance(project).updateVisibleHighlighters(editor); } private static void initialize(final PsiLocalVariable variable) throws IncorrectOperationException { diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java index a80550a48e1d..e4eaeb4e0a70 100644 --- a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java @@ -8,7 +8,6 @@ import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.completion.CompletionMemory; import com.intellij.codeInsight.completion.JavaCompletionUtil; import com.intellij.codeInsight.completion.JavaMethodCallElement; -import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.codeInsight.daemon.impl.ParameterHintsPresentationManager; import com.intellij.codeInsight.hint.ParameterInfoController; import com.intellij.codeInsight.hints.ParameterHintsPass; @@ -47,8 +46,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.awt.*; -import java.util.*; import java.util.List; +import java.util.*; /** * @author Maxim.Mossienko @@ -102,7 +101,6 @@ public class MethodParameterInfoHandler implements ParameterInfoHandlerWithTabAc CandidateInfo[] candidates = getMethods(argumentList); if (candidates.length == 0) { - DaemonCodeAnalyzer.getInstance(context.getProject()).updateVisibleHighlighters(context.getEditor()); return null; } context.setItemsToShow(candidates); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtil.java index c4fd5e92811c..b8f91b8b5171 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtil.java @@ -3,7 +3,6 @@ package com.intellij.codeInsight; import com.intellij.codeInsight.completion.CompletionUtil; -import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.codeInsight.lookup.Lookup; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupManager; @@ -347,7 +346,7 @@ public class TargetElementUtil extends TargetElementUtilBase { @Nullable private PsiElement getReferenceOrReferencedElement(PsiFile file, Editor editor, int flags, int offset) { - PsiElement result = doGetReferenceOrReferencedElement(file, editor, flags, offset); + PsiElement result = doGetReferenceOrReferencedElement(editor, flags, offset); PsiElement languageElement = file.findElementAt(offset); Language language = languageElement != null ? languageElement.getLanguage() : file.getLanguage(); TargetElementEvaluatorEx2 evaluator = getElementEvaluatorsEx2(language); @@ -358,7 +357,7 @@ public class TargetElementUtil extends TargetElementUtilBase { } @Nullable - private PsiElement doGetReferenceOrReferencedElement(PsiFile file, Editor editor, int flags, int offset) { + private static PsiElement doGetReferenceOrReferencedElement(Editor editor, int flags, int offset) { PsiReference ref = findReference(editor, offset); if (ref == null) return null; @@ -369,17 +368,7 @@ public class TargetElementUtil extends TargetElementUtilBase { if (element != null) return element; } - PsiManager manager = file.getManager(); - PsiElement refElement = ref.resolve(); - if (refElement == null) { - if (ApplicationManager.getApplication().isDispatchThread()) { - DaemonCodeAnalyzer.getInstance(manager.getProject()).updateVisibleHighlighters(editor); - } - return null; - } - else { - return refElement; - } + return ref.resolve(); } @Override diff --git a/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java b/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java index 6bebe55a8f80..236fba55bd65 100644 --- a/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java @@ -16,7 +16,6 @@ package com.intellij.codeInsight.hint.api.impls; import com.intellij.codeInsight.CodeInsightBundle; -import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.MutableLookupElement; import com.intellij.lang.parameterInfo.*; @@ -68,7 +67,6 @@ public class XmlParameterInfoHandler implements ParameterInfoHandler