From fb6671cf885eb2d4d5d5a9dbc034bd7a9286eba3 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 31 Jan 2012 19:27:49 +0100 Subject: [PATCH] classes used in xml aren't unused --- .../codeInsight/daemon/impl/PostHighlightingPass.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java index 6ab7b118c92f..84e741d7f1dd 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java @@ -616,11 +616,12 @@ public class PostHighlightingPass extends TextEditorHighlightingPass { SearchScope useScope = member.getUseScope(); Project project = member.getProject(); if (useScope instanceof GlobalSearchScope) { - GlobalSearchScope scope = (GlobalSearchScope)useScope; // some classes may have references from within XML outside dependent modules, e.g. our actions - if (member instanceof PsiClass) scope = GlobalSearchScope.projectScope(project).uniteWith(scope); + if (member instanceof PsiClass) { + useScope = GlobalSearchScope.projectScope(project).uniteWith((GlobalSearchScope)useScope); + } - PsiSearchHelper.SearchCostResult cheapEnough = PsiSearchHelper.SERVICE.getInstance(project).isCheapEnoughToSearch(name, scope, + PsiSearchHelper.SearchCostResult cheapEnough = PsiSearchHelper.SERVICE.getInstance(project).isCheapEnoughToSearch(name, (GlobalSearchScope)useScope, helper.shouldIgnoreUsagesInCurrentFile() ? member.getContainingFile() : null, progress); if (cheapEnough == PsiSearchHelper.SearchCostResult.TOO_MANY_OCCURRENCES) return false;