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

inspection toolwindow: edit inspection settings ignore dummy profiles IDEA-156728

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-05-27 20:16:05 +03:00
parent 4c12b5a02d
commit 7800e0d2e7
10 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class QuickFixAction extends AnAction implements CustomComponentAction {
e.getPresentation().setEnabled(false);
final InspectionTree tree = view.getTree();
final InspectionToolWrapper toolWrapper = tree.getSelectedToolWrapper();
final InspectionToolWrapper toolWrapper = tree.getSelectedToolWrapper(true);
if (!view.isSingleToolInSelection() || toolWrapper != myToolWrapper) {
return;
}
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNodeInfo.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class InspectionNodeInfo extends JPanel {
@NotNull final Project project) {
setLayout(new GridBagLayout());
setBorder(IdeBorderFactory.createEmptyBorder(11, 0, 0, 0));
final InspectionToolWrapper toolWrapper = tree.getSelectedToolWrapper();
final InspectionToolWrapper toolWrapper = tree.getSelectedToolWrapper(true);
LOG.assertTrue(toolWrapper != null);
InspectionProfileImpl currentProfile =
(InspectionProfileImpl)InspectionProjectProfileManager.getInstance(project).getProjectProfileImpl();
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
+4 -4
View File
@@ -413,12 +413,12 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
myLoadingProgressPreview = null;
}
if (myApplyingFix) {
final InspectionToolWrapper wrapper = myTree.getSelectedToolWrapper();
final InspectionToolWrapper wrapper = myTree.getSelectedToolWrapper(true);
LOG.assertTrue(wrapper != null);
mySplitter.setSecondComponent(InspectionResultsViewUtil.getApplyingFixLabel(wrapper));
} else {
if (myTree.getSelectionModel().getSelectionCount() != 1) {
if (myTree.getSelectedToolWrapper() == null) {
if (myTree.getSelectedToolWrapper(true) == null) {
mySplitter.setSecondComponent(InspectionResultsViewUtil.getNothingToShowTextLabel());
}
else {
@@ -478,7 +478,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
editorPanel.setLayout(new BorderLayout());
final int problemCount = myTree.getSelectedProblemCount();
JComponent previewPanel = null;
final InspectionToolWrapper tool = myTree.getSelectedToolWrapper();
final InspectionToolWrapper tool = myTree.getSelectedToolWrapper(true);
if (tool != null && refEntity != null && refEntity.isValid()) {
final InspectionToolPresentation presentation = myGlobalInspectionContext.getPresentation(tool);
previewPanel = presentation.getCustomPreviewPanel(refEntity);
@@ -939,7 +939,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
}
public boolean isSingleToolInSelection() {
return myTree != null && myTree.getSelectedToolWrapper() != null;
return myTree != null && myTree.getSelectedToolWrapper(true) != null;
}
public boolean isRerun() {
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTree.java
+5 -2
View File
@@ -126,7 +126,7 @@ public class InspectionTree extends Tree {
}
@Nullable
public InspectionToolWrapper getSelectedToolWrapper() {
public InspectionToolWrapper getSelectedToolWrapper(boolean allowDummy) {
final TreePath[] paths = getSelectionPaths();
if (paths == null) return null;
InspectionToolWrapper toolWrapper = null;
@@ -139,6 +139,9 @@ public class InspectionTree extends Tree {
}
if (node instanceof InspectionNode) {
InspectionToolWrapper wrapper = ((InspectionNode)node).getToolWrapper();
if (!allowDummy && getContext().getPresentation(wrapper).isDummy()) {
continue;
}
if (toolWrapper == null) {
toolWrapper = wrapper;
}
@@ -187,7 +190,7 @@ public class InspectionTree extends Tree {
public RefEntity[] getSelectedElements() {
TreePath[] selectionPaths = getSelectionPaths();
if (selectionPaths != null) {
InspectionToolWrapper toolWrapper = getSelectedToolWrapper();
InspectionToolWrapper toolWrapper = getSelectedToolWrapper(true);
if (toolWrapper == null) return RefEntity.EMPTY_ELEMENTS_ARRAY;
Set<RefEntity> result = new LinkedHashSet<RefEntity>();
platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixPreviewPanelFactory.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class QuickFixPreviewPanelFactory {
public QuickFixReadyPanel(@NotNull InspectionResultsView view, EditorEx editor) {
myView = view;
myWrapper = view.getTree().getSelectedToolWrapper();
myWrapper = view.getTree().getSelectedToolWrapper(true);
LOG.assertTrue(myWrapper != null);
CommonProblemDescriptor[] descriptors = myView.getTree().getSelectedDescriptors();
if (editor != null) {
platform/lang-impl/src/com/intellij/codeInspection/ui/actions/EditSettingsAction.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class EditSettingsAction extends InspectionViewActionBase {
public void actionPerformed(AnActionEvent e) {
final InspectionResultsView view = getView(e);
final InspectionProjectProfileManager profileManager = InspectionProjectProfileManager.getInstance(view.getProject());
final InspectionToolWrapper toolWrapper = view.getTree().getSelectedToolWrapper();
final InspectionToolWrapper toolWrapper = view.getTree().getSelectedToolWrapper(false);
InspectionProfile inspectionProfile = view.getCurrentProfile();
final boolean profileIsDefined = view.isProfileDefined();
if (!profileIsDefined) {
platform/lang-impl/src/com/intellij/codeInspection/ui/actions/InvokeQuickFixAction.java
+2 -2
View File
@@ -50,7 +50,7 @@ public class InvokeQuickFixAction extends AnAction {
@Override
public void update(AnActionEvent e) {
final Presentation presentation = e.getPresentation();
InspectionToolWrapper toolWrapper = myView.getTree().getSelectedToolWrapper();
InspectionToolWrapper toolWrapper = myView.getTree().getSelectedToolWrapper(true);
final InspectionRVContentProvider provider = myView.getProvider();
if (myView.isUpdating() && !myView.getTree().areDescriptorNodesSelected()) {
presentation.setEnabled(false);
@@ -82,7 +82,7 @@ public class InvokeQuickFixAction extends AnAction {
@Override
public void actionPerformed(AnActionEvent e) {
InspectionToolWrapper toolWrapper = myView.getTree().getSelectedToolWrapper();
InspectionToolWrapper toolWrapper = myView.getTree().getSelectedToolWrapper(true);
assert toolWrapper != null;
final QuickFixAction[] quickFixes = myView.getProvider().getQuickFixes(toolWrapper, myView.getTree());
if (quickFixes == null || quickFixes.length == 0) {
platform/lang-impl/src/com/intellij/codeInspection/ui/actions/KeyAwareInspectionViewAction.java
+3 -3
View File
@@ -60,14 +60,14 @@ public abstract class KeyAwareInspectionViewAction extends InspectionViewActionB
@Override
protected boolean isEnabled(@NotNull InspectionResultsView view, AnActionEvent e) {
final InspectionToolWrapper wrapper = view.getTree().getSelectedToolWrapper();
final InspectionToolWrapper wrapper = view.getTree().getSelectedToolWrapper(true);
return wrapper != null && HighlightDisplayKey.find(wrapper.getShortName()) != null;
}
@Override
public void actionPerformed(AnActionEvent e) {
final InspectionResultsView view = getView(e);
final HighlightDisplayKey key = HighlightDisplayKey.find(view.getTree().getSelectedToolWrapper().getShortName());
final HighlightDisplayKey key = HighlightDisplayKey.find(view.getTree().getSelectedToolWrapper(true).getShortName());
actionPerformed(view, key);
}
@@ -82,7 +82,7 @@ public abstract class KeyAwareInspectionViewAction extends InspectionViewActionB
protected boolean isEnabled(@NotNull InspectionResultsView view, AnActionEvent e) {
final boolean enabled = super.isEnabled(view, e);
if (!enabled) return false;
final HighlightDisplayKey key = HighlightDisplayKey.find(view.getTree().getSelectedToolWrapper().getShortName());
final HighlightDisplayKey key = HighlightDisplayKey.find(view.getTree().getSelectedToolWrapper(true).getShortName());
final InspectionProfile profile = (InspectionProfile)InspectionProjectProfileManager.getInstance(view.getProject()).getProjectProfileImpl();
return profile.isToolEnabled(key);
}
platform/lang-impl/src/com/intellij/codeInspection/ui/actions/QuickFixesViewActionGroup.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class QuickFixesViewActionGroup extends ActionGroup {
if (view == null) {
return AnAction.EMPTY_ARRAY;
}
final InspectionToolWrapper wrapper = view.getTree().getSelectedToolWrapper();
final InspectionToolWrapper wrapper = view.getTree().getSelectedToolWrapper(true);
if (wrapper == null) return AnAction.EMPTY_ARRAY;
final QuickFixAction[] fixes = view.getProvider().getQuickFixes(wrapper, view.getTree());
platform/lang-impl/src/com/intellij/codeInspection/ui/actions/suppress/SuppressActionWrapper.java
+2 -2
View File
@@ -65,7 +65,7 @@ public class SuppressActionWrapper extends ActionGroup implements CompactActionG
public AnAction[] getChildren(@Nullable final AnActionEvent e) {
final InspectionResultsView view = getView(e);
if (view == null) return AnAction.EMPTY_ARRAY;
final InspectionToolWrapper wrapper = view.getTree().getSelectedToolWrapper();
final InspectionToolWrapper wrapper = view.getTree().getSelectedToolWrapper(true);
if (wrapper == null) return AnAction.EMPTY_ARRAY;
final Set<SuppressIntentionAction> suppressActions = view.getSuppressActions(wrapper);
@@ -105,7 +105,7 @@ public class SuppressActionWrapper extends ActionGroup implements CompactActionG
Project project = view.getProject();
final String templatePresentationText = getTemplatePresentation().getText();
LOG.assertTrue(templatePresentationText != null);
final InspectionToolWrapper wrapper = view.getTree().getSelectedToolWrapper();
final InspectionToolWrapper wrapper = view.getTree().getSelectedToolWrapper(true);
LOG.assertTrue(wrapper != null);
final Set<SuppressableInspectionTreeNode> nodesAsSet = getNodesToSuppress(view);
final SuppressableInspectionTreeNode[] nodes = nodesAsSet.toArray(new SuppressableInspectionTreeNode[nodesAsSet.size()]);