From 12cbc56e738139dfd4bdc66e100cf22f239747f9 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 21 Jul 2011 17:11:30 +0400 Subject: [PATCH] do not show dialogs during highlighting --- .../com/intellij/find/findUsages/FindUsagesManager.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java b/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java index dd1a04214d21..08c62c3f18e7 100644 --- a/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java +++ b/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java @@ -287,7 +287,7 @@ public class FindUsagesManager implements JDOMExternalizable { checkNotNull(secondaryElements, handler, "getSecondaryElements()"); UsageInfoToUsageConverter.TargetElementsDescriptor descriptor = new UsageInfoToUsageConverter.TargetElementsDescriptor(primaryElements, secondaryElements); if (singleFile) { - findUsagesOptions = (FindUsagesOptions)findUsagesOptions.clone(); + findUsagesOptions = findUsagesOptions.clone(); editor.putUserData(KEY_START_USAGE_AGAIN, null); findUsagesInEditor(descriptor, handler, scopeFile, FileSearchScope.FROM_START, findUsagesOptions, editor); } @@ -312,10 +312,9 @@ public class FindUsagesManager implements JDOMExternalizable { } public boolean isUsed(@NotNull PsiElement element, @NotNull SearchScope scope) { - FindUsagesHandler handler = getFindUsagesHandler(element, false); + FindUsagesHandler handler = getFindUsagesHandler(element, true); if (handler == null) return false; - UsageInfoToUsageConverter.TargetElementsDescriptor descriptor = - new UsageInfoToUsageConverter.TargetElementsDescriptor(handler.getPrimaryElements(), handler.getSecondaryElements()); + UsageInfoToUsageConverter.TargetElementsDescriptor descriptor = new UsageInfoToUsageConverter.TargetElementsDescriptor(element); FindUsagesOptions findUsagesOptions = handler.getFindUsagesOptions().clone(); findUsagesOptions.searchScope = scope; UsageSearcher usageSearcher = createUsageSearcher(descriptor, handler, findUsagesOptions, null);