From 362625ae541f032fd32177f22bc3317756176b79 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 6 Jul 2010 18:39:59 +0400 Subject: [PATCH] do not skip remembered scope to custom project and libraries one --- .../src/com/intellij/analysis/BaseAnalysisActionDialog.java | 3 +-- .../codeInspection/ex/GlobalInspectionContextImpl.java | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java b/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java index a96103a924a9..dfc629e03c66 100644 --- a/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java +++ b/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java @@ -152,8 +152,7 @@ public class BaseAnalysisActionDialog extends DialogWrapper { if (searchInLib && GlobalSearchScope.projectScope(myProject).getDisplayName().equals(preselect)) { preselect = GlobalSearchScope.allScope(myProject).getDisplayName(); } - if (GlobalSearchScope.allScope(myProject).getDisplayName().equals(preselect)) { - myAnalysisOptions.SCOPE_TYPE = AnalysisScope.CUSTOM; + if (GlobalSearchScope.allScope(myProject).getDisplayName().equals(preselect) && myAnalysisOptions.SCOPE_TYPE == AnalysisScope.CUSTOM) { myAnalysisOptions.CUSTOM_SCOPE_NAME = preselect; searchInLib = true; } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java index 8da57fa38b60..e8573862ecd3 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java @@ -95,7 +95,7 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext { private final Map myTools = new THashMap(); - private final AnalysisUIOptions myUIOptions; + private AnalysisUIOptions myUIOptions; public GlobalInspectionContextImpl(Project project, NotNullLazyValue contentManager) { myProject = project; @@ -402,6 +402,7 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext { } private void launchInspections(final AnalysisScope scope, final InspectionManager manager) { + myUIOptions = AnalysisUIOptions.getInstance(myProject).copy(); ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { PsiDocumentManager.getInstance(myProject).commitAllDocuments();