From d5ebd0fca2d7565472c5952c8b088f50dbdddd0c Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Wed, 30 Sep 2020 16:56:22 +0200 Subject: [PATCH] Fix inspections dialog apply button behaviour (IDEA-240687) GitOrigin-RevId: 2d8cac1d3c2102ab654b55455e3273970a00066c --- .../codeInspection/ui/SingleInspectionProfilePanel.java | 2 +- .../inspection/StructuralSearchProfileActionProvider.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java index 5bb060552618..a70c4e89e41c 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java @@ -1072,7 +1072,7 @@ public class SingleInspectionProfilePanel extends JPanel { public boolean isModified() { if (myTreeTable == null) return false; if (myModified) return true; - if (myProfile.isChanged() || myProfile.getSchemeState() == SchemeState.POSSIBLY_CHANGED) return true; + if (myProfile.isChanged()) return true; if (myProfile.getSource().isProjectLevel() != myProfile.isProjectLevel()) return true; if (!Comparing.strEqual(myProfile.getSource().getName(), myProfile.getName())) return true; if (!Arrays.equals(myInitialScopesOrder, myProfile.getScopesOrder())) return true; diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchProfileActionProvider.java b/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchProfileActionProvider.java index c11c0fd698cd..5645903c7c0f 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchProfileActionProvider.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchProfileActionProvider.java @@ -98,6 +98,7 @@ public class StructuralSearchProfileActionProvider extends InspectionProfileActi final SSBasedInspection inspection = InspectionProfileUtil.getStructuralSearchInspection(profile); inspection.removeConfigurationsWithUuid(UUID.fromString(shortName)); profile.removeTool(shortName); + profile.setModified(true); InspectionProfileUtil.fireProfileChanged(profile); } } @@ -152,6 +153,9 @@ public class StructuralSearchProfileActionProvider extends InspectionProfileActi configuration.setUuid(null); inspection.addConfiguration(configuration); addInspectionToProfile(project, profile, configuration); + if (profile instanceof InspectionProfileModifiableModel) { + ((InspectionProfileModifiableModel)profile).setModified(true); + } InspectionProfileUtil.fireProfileChanged(profile); profile.getProfileManager().fireProfileChanged(profile); return true;