From caed8cc752158aebc4f0091fbc2444ba1896155d Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 6 Dec 2013 14:17:46 +0100 Subject: [PATCH] scope to check for cheap search (IDEA-117665) --- .../DeclareCollectionAsInterfaceInspection.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java index 64cdb82afc3b..96836a7b0c2f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java @@ -23,6 +23,7 @@ import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.PsiSearchHelper; +import com.intellij.psi.search.SearchScope; import com.intellij.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; @@ -301,11 +302,11 @@ public class DeclareCollectionAsInterfaceInspection extends BaseInspection { final ProgressManager progressManager = ProgressManager.getInstance(); final PsiSearchHelper searchHelper = PsiSearchHelper.SERVICE.getInstance(element.getProject()); - final GlobalSearchScope scope = - GlobalSearchScope.projectScope(element.getProject()); - return searchHelper.isCheapEnoughToSearch(name, scope, null, - progressManager.getProgressIndicator()) != - PsiSearchHelper.SearchCostResult.TOO_MANY_OCCURRENCES; + SearchScope useScope = element.getUseScope(); + if (useScope instanceof GlobalSearchScope) { + return searchHelper.isCheapEnoughToSearch(name, (GlobalSearchScope)useScope, null, progressManager.getProgressIndicator()) != PsiSearchHelper.SearchCostResult.TOO_MANY_OCCURRENCES; + } + return true; } } } \ No newline at end of file