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 tool window: do not show huge right panel when fix is applying

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-04-26 10:20:21 +03:00
parent 87e2aff37e
commit 45ca5aca75
3 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java
+2 -3
View File
@@ -114,15 +114,14 @@ public class QuickFixAction extends AnAction implements CustomComponentAction {
final InspectionTree tree = view.getTree();
final CommonProblemDescriptor[] descriptors;
try {
view.setUpdating(true);
view.syncRightPanel();
view.setApplyingFix(true);
if (isProblemDescriptorsAcceptable() && (descriptors = tree.getSelectedDescriptors(true)).length > 0) {
doApplyFix(view.getProject(), descriptors, tree.getContext());
} else {
doApplyFix(getSelectedElements(e), view);
}
} finally {
view.setUpdating(false);
view.setApplyingFix(false);
}
}
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
+47 -35
View File
@@ -114,6 +114,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
private boolean myRerun;
private volatile boolean myDisposed;
private int myUpdatingRequestors; //accessed only in edt
private boolean myApplyingFix = false; //accessed only in edt
@NotNull
private final InspectionRVContentProvider myProvider;
@@ -375,6 +376,11 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
return null;
}
public void setApplyingFix(boolean applyingFix) {
myApplyingFix = applyingFix;
syncRightPanel();
}
public void openRightPanelIfNeed() {
if (mySplitter.getSecondComponent() == null) {
syncRightPanel();
@@ -387,42 +393,48 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
Disposer.dispose(myLoadingProgressPreview);
myLoadingProgressPreview = null;
}
if (myTree.getSelectionModel().getSelectionCount() != 1) {
if (myTree.getSelectedToolWrapper() == null) {
mySplitter.setSecondComponent(InspectionResultsViewUtil.getNothingToShowTextLabel());
}
else {
showInRightPanel(myTree.getCommonSelectedElement());
}
}
else {
TreePath pathSelected = myTree.getSelectionModel().getLeadSelectionPath();
if (pathSelected != null) {
final InspectionTreeNode node = (InspectionTreeNode)pathSelected.getLastPathComponent();
if (node instanceof ProblemDescriptionNode) {
final ProblemDescriptionNode problemNode = (ProblemDescriptionNode)node;
showInRightPanel(problemNode.getElement());
}
else if (node instanceof InspectionPackageNode ||
node instanceof InspectionModuleNode ||
node instanceof RefElementNode) {
showInRightPanel(node.getContainingFileLocalEntity());
}
else if (node instanceof InspectionNode) {
if (myGlobalInspectionContext.getPresentation(((InspectionNode)node).getToolWrapper()).isDummy()) {
mySplitter.setSecondComponent(InspectionResultsViewUtil.getNothingToShowTextLabel());
}
else {
showInRightPanel(null);
}
}
else if (node instanceof InspectionRootNode || node instanceof InspectionGroupNode || node instanceof InspectionSeverityGroupNode) {
final InspectionViewNavigationPanel panel = new InspectionViewNavigationPanel(node, myTree);
myLoadingProgressPreview = panel;
mySplitter.setSecondComponent(panel);
if (myApplyingFix) {
final InspectionToolWrapper wrapper = myTree.getSelectedToolWrapper();
LOG.assertTrue(wrapper != null);
mySplitter.setSecondComponent(InspectionResultsViewUtil.getApplyingFixLabel(wrapper));
} else {
if (myTree.getSelectionModel().getSelectionCount() != 1) {
if (myTree.getSelectedToolWrapper() == null) {
mySplitter.setSecondComponent(InspectionResultsViewUtil.getNothingToShowTextLabel());
}
else {
LOG.error("Unexpected node: " + node.getClass());
showInRightPanel(myTree.getCommonSelectedElement());
}
}
else {
TreePath pathSelected = myTree.getSelectionModel().getLeadSelectionPath();
if (pathSelected != null) {
final InspectionTreeNode node = (InspectionTreeNode)pathSelected.getLastPathComponent();
if (node instanceof ProblemDescriptionNode) {
final ProblemDescriptionNode problemNode = (ProblemDescriptionNode)node;
showInRightPanel(problemNode.getElement());
}
else if (node instanceof InspectionPackageNode ||
node instanceof InspectionModuleNode ||
node instanceof RefElementNode) {
showInRightPanel(node.getContainingFileLocalEntity());
}
else if (node instanceof InspectionNode) {
if (myGlobalInspectionContext.getPresentation(((InspectionNode)node).getToolWrapper()).isDummy()) {
mySplitter.setSecondComponent(InspectionResultsViewUtil.getNothingToShowTextLabel());
}
else {
showInRightPanel(null);
}
}
else if (node instanceof InspectionRootNode || node instanceof InspectionGroupNode || node instanceof InspectionSeverityGroupNode) {
final InspectionViewNavigationPanel panel = new InspectionViewNavigationPanel(node, myTree);
myLoadingProgressPreview = panel;
mySplitter.setSecondComponent(panel);
}
else {
LOG.error("Unexpected node: " + node.getClass());
}
}
}
}
@@ -506,7 +518,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
});
}
else {
myPreviewEditor = (EditorEx)EditorFactory.getInstance().createEditor( document, myProject, file.getVirtualFile(), true);
myPreviewEditor = (EditorEx)EditorFactory.getInstance().createEditor(document, myProject, file.getVirtualFile(), true);
DiffUtil.setFoldingModelSupport(myPreviewEditor);
final EditorSettings settings = myPreviewEditor.getSettings();
settings.setLineNumbersShown(false);
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewUtil.java
+8
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.codeInspection.ui;
import com.intellij.codeInspection.ex.InspectionToolWrapper;
import com.intellij.codeInspection.reference.RefElement;
import com.intellij.codeInspection.reference.RefEntity;
import com.intellij.openapi.editor.Editor;
@@ -53,11 +54,18 @@ public class InspectionResultsViewUtil {
return createLabelForText(InspectionViewNavigationPanel.getTitleText(false, false));
}
@NotNull
static JComponent getInvalidEntityLabel(@NotNull RefEntity entity) {
final String name = entity.getName();
return createLabelForText("\'" + name + "\' is no longer valid.");
}
@NotNull
static JComponent getApplyingFixLabel(@NotNull InspectionToolWrapper wrapper) {
return createLabelForText("Applying quick fix for \'" + wrapper.getDisplayName() + "\'...");
}
@NotNull
private static JLabel createLabelForText(String text) {
final JLabel multipleSelectionLabel = new JBLabel(text);
multipleSelectionLabel.setVerticalAlignment(SwingConstants.TOP);