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: do not enable selected profile as active from toolwindow inspection settings IDEA-156825

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-07-06 18:25:39 +03:00
parent b58dc57487
commit 28fdfc245f
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java
+7 -1
View File
@@ -104,7 +104,13 @@ public class EditInspectionToolsSettingsAction implements IntentionAction, Icona
final ErrorsConfigurable errorsConfigurable;
if (!canChooseDifferentProfile) {
errorsConfigurable = new ProjectInspectionToolsConfigurable(InspectionProfileManager.getInstance(),
InspectionProjectProfileManager.getInstance(project));
InspectionProjectProfileManager.getInstance(project)) {
@Override
protected boolean setActiveProfileAsDefaultOnApply() {
return false;
}
};
}
else {
errorsConfigurable = ErrorsConfigurable.SERVICE.createConfigurable(project);
platform/lang-impl/src/com/intellij/codeInspection/ui/actions/EditSettingsAction.java
+2 -2
View File
@@ -80,7 +80,7 @@ public class EditSettingsAction extends InspectionViewActionBase {
if (toolWrapper != null) {
final HighlightDisplayKey key = HighlightDisplayKey.find(toolWrapper.getShortName()); //do not search for dead code entry point tool
if (key != null) {
if (new EditInspectionToolsSettingsAction(key).editToolSettings(view.getProject(), (InspectionProfileImpl)inspectionProfile, true)) {
if (new EditInspectionToolsSettingsAction(key).editToolSettings(view.getProject(), (InspectionProfileImpl)inspectionProfile, false)) {
view.updateCurrentProfile();
}
return;
@@ -88,7 +88,7 @@ public class EditSettingsAction extends InspectionViewActionBase {
}
final String[] path = view.getTree().getSelectedGroupPath();
if (EditInspectionToolsSettingsAction.editSettings(view.getProject(), inspectionProfile, true, (c) -> {
if (EditInspectionToolsSettingsAction.editSettings(view.getProject(), inspectionProfile, false, (c) -> {
if (path != null) {
c.selectInspectionGroup(path);
}
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionToolsConfigurable.java
+5 -1
View File
@@ -162,6 +162,10 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable
myProfiles.getProfilesComboBox().selectProfile(model);
}
protected boolean setActiveProfileAsDefaultOnApply() {
return true;
}
@Override
public String getDisplayName() {
return DISPLAY_NAME;
@@ -530,7 +534,7 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable
else {
final SingleInspectionProfilePanel panel = getProfilePanel(inspectionProfile);
panel.apply();
if (panel == selectedPanel) {
if (setActiveProfileAsDefaultOnApply() && panel == selectedPanel) {
applyRootProfile(panel.getCurrentProfileName(), panel.isProjectLevel());
}
}