From 5d2dfa41c046ce288f1aaddb243aa364aef043db Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Wed, 27 Jul 2016 03:47:25 +0300 Subject: [PATCH] do not enlarge use scope for local-scoped elements --- .../com/intellij/ide/scratch/ScratchFileServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileServiceImpl.java b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileServiceImpl.java index e86a31d0cda2..8c0ea1d34731 100644 --- a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileServiceImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileServiceImpl.java @@ -49,10 +49,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.LanguageSubstitutor; import com.intellij.psi.LanguageSubstitutors; import com.intellij.psi.PsiElement; -import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.search.ProjectAndLibrariesScope; -import com.intellij.psi.search.SearchScope; -import com.intellij.psi.search.UseScopeEnlarger; +import com.intellij.psi.search.*; import com.intellij.psi.util.PsiUtilCore; import com.intellij.usages.impl.rules.UsageType; import com.intellij.usages.impl.rules.UsageTypeProvider; @@ -367,6 +364,8 @@ public class ScratchFileServiceImpl extends ScratchFileService implements Persis @Nullable @Override public SearchScope getAdditionalUseScope(@NotNull PsiElement element) { + SearchScope useScope = element.getUseScope(); + if (useScope instanceof LocalSearchScope) return null; return buildScratchesSearchScope(); } }