MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

prefer file based analyze scope over module one as it would be available anyway (IDEA-106260)

Browse Source
This commit is contained in:
anna
2013-04-29 20:50:24 +02:00
parent 3d08654bff
commit 556e4e6ba6
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java
+11 -10
View File
@@ -80,7 +80,7 @@ public abstract class BaseAnalysisAction extends AnAction {
AnalysisScopeBundle.message("analysis.scope.title", myAnalysisNoon),
project,
scope,
module != null && scope.getScopeType() != AnalysisScope.MODULE ? ModuleUtilCore
module != null ? ModuleUtilCore
.getModuleNameInReadAction(module) : null,
rememberScope, AnalysisUIOptions.getInstance(project), element){
@Override
@@ -149,15 +149,6 @@ public abstract class BaseAnalysisAction extends AnAction {
return analysisScope;
}
Module moduleContext = LangDataKeys.MODULE_CONTEXT.getData(dataContext);
if (moduleContext != null) {
return new AnalysisScope(moduleContext);
}
Module [] modulesArray = LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext);
if (modulesArray != null) {
return new AnalysisScope(modulesArray);
}
final PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataContext);
if (psiFile != null && psiFile.getManager().isInProject(psiFile)) {
final VirtualFile file = psiFile.getVirtualFile();
@@ -195,6 +186,16 @@ public abstract class BaseAnalysisAction extends AnAction {
}
return new AnalysisScope(project, files);
}
Module moduleContext = LangDataKeys.MODULE_CONTEXT.getData(dataContext);
if (moduleContext != null) {
return new AnalysisScope(moduleContext);
}
Module[] modulesArray = LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext);
if (modulesArray != null) {
return new AnalysisScope(modulesArray);
}
return project == null ? null : new AnalysisScope(project);
}