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

run inspection action: add inspection view scope to suggested (IDEA-175101)

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-07-04 17:36:49 +03:00
parent d4f85b5855
commit 78ef85b1b5
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java
+30 -7
View File
@@ -16,6 +16,7 @@
package com.intellij.analysis;
import com.intellij.codeInspection.ui.InspectionResultsView;
import com.intellij.ide.highlighter.ArchiveFileType;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.diagnostic.Logger;
@@ -61,12 +62,10 @@ public abstract class BaseAnalysisAction extends AnAction {
@Override
public void actionPerformed(AnActionEvent e) {
Project project = e.getData(CommonDataKeys.PROJECT);
if (project == null) return;
DataContext dataContext = e.getDataContext();
final Project project = e.getData(CommonDataKeys.PROJECT);
final Module module = e.getData(LangDataKeys.MODULE);
if (project == null) {
return;
}
Module module = getModuleFromContext(dataContext);
AnalysisScope scope = getInspectionScope(dataContext);
LOG.assertTrue(scope != null);
final boolean rememberScope = ActionPlaces.isMainMenuOrActionSearch(e.getPlace());
@@ -124,8 +123,9 @@ public abstract class BaseAnalysisAction extends AnAction {
@Nullable
private AnalysisScope getInspectionScope(@NotNull DataContext dataContext) {
if (CommonDataKeys.PROJECT.getData(dataContext) == null) return null;
AnalysisScope scope = getInspectionScopeImpl(dataContext);
AnalysisScope scope = getFileScopeFromInspectionView(dataContext);
if (scope != null) return scope;
scope = getInspectionScopeImpl(dataContext);
return scope != null && scope.getScopeType() != AnalysisScope.INVALID ? scope : null;
}
@@ -198,4 +198,27 @@ public abstract class BaseAnalysisAction extends AnAction {
return null;
}
private static AnalysisScope getFileScopeFromInspectionView(DataContext dataContext) {
InspectionResultsView inspectionView = dataContext.getData(InspectionResultsView.DATA_KEY);
if (inspectionView != null) {
AnalysisScope scope = inspectionView.getScope();
if (scope.getScopeType() == AnalysisScope.FILE && scope.isValid()) {
return scope;
}
}
return null;
}
@Nullable
private static Module getModuleFromContext(@NotNull DataContext dataContext) {
InspectionResultsView inspectionView = dataContext.getData(InspectionResultsView.DATA_KEY);
if (inspectionView != null) {
AnalysisScope scope = inspectionView.getScope();
if (scope.getScopeType() == AnalysisScope.MODULE && scope.isValid()) {
return scope.getModule();
}
}
return dataContext.getData(LangDataKeys.MODULE);
}
}
platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java
+1 -1
View File
@@ -195,7 +195,7 @@ public class BaseAnalysisActionDialog extends DialogWrapper {
myScopeCombo.setCurrentSelection(false);
//correct selection
myProjectButton.setSelected(myRememberScope && myAnalysisOptions.SCOPE_TYPE == AnalysisScope.PROJECT || myFileName == null);
myProjectButton.setSelected(myRememberScope && myAnalysisOptions.SCOPE_TYPE == AnalysisScope.PROJECT || (myFileName == null && !myModuleButton.isSelected()));
myFileButton.setSelected(myFileName != null &&
(!myRememberScope ||
myAnalysisOptions.SCOPE_TYPE != AnalysisScope.PROJECT && !useModuleScope && myAnalysisOptions.SCOPE_TYPE != AnalysisScope.CUSTOM && !useUncommitedFiles));