From c04619f10561265d19babd873cef9e8021bd722b Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 11 Nov 2016 13:18:47 +0100
Subject: [PATCH] =?UTF-8?q?model=20commit=20should=20only=20fire=20changes?=
 =?UTF-8?q?,=20but=20to=20not=20add=20scheme=20=E2=80=94=20it=20is=20point?=
 =?UTF-8?q?less?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codeInspection/ex/InspectionProfileTest.java      | 11 ++++++++---
 .../ex/InspectionProfileModifiableModel.kt            |  2 +-
 .../codeInspection/BaseInspectionProfileManager.kt    |  7 -------
 .../ui/SingleInspectionProfilePanel.java              |  3 +++
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
index de9269ef60a2..ba6bd28fd434 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
@@ -94,15 +94,15 @@ public class InspectionProfileTest extends LightIdeaTestCase {
   public void testSameNameSharedProfile() throws Exception {
     BaseInspectionProfileManager profileManager = getApplicationProfileManager();
     InspectionProfileImpl localProfile = createProfile();
-    profileManager.updateProfile(localProfile);
+    updateProfile(profileManager, localProfile);
 
     ProjectInspectionProfileManager projectProfileManager = ProjectInspectionProfileManager.getInstance(getProject());
     try {
       //normally on open project profile wrappers are init for both managers
-      profileManager.updateProfile(localProfile);
+      updateProfile(profileManager, localProfile);
       InspectionProfileImpl profile = new InspectionProfileImpl(PROFILE, InspectionToolRegistrar.getInstance(), projectProfileManager,
                                                                 InspectionProfileImpl.getBaseProfile(), null);
-      projectProfileManager.updateProfile(profile);
+      updateProfile(projectProfileManager, profile);
       projectProfileManager.setRootProfile(profile.getName());
 
       assertTrue(projectProfileManager.getCurrentProfile() == profile);
@@ -112,6 +112,11 @@ public class InspectionProfileTest extends LightIdeaTestCase {
     }
   }
 
+  private static void updateProfile(BaseInspectionProfileManager profileManager, InspectionProfileImpl localProfile) {
+    profileManager.addProfile(localProfile);
+    profileManager.fireProfileChanged(localProfile);
+  }
+
   public void testConvertOldProfile() throws Exception {
     Element element = JDOMUtil.loadDocument("<inspections version=\"1.0\">\n" +
                                             "  <option name=\"myName\" value=\"ToConvert\" />\n" +
diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileModifiableModel.kt b/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileModifiableModel.kt
index f7720767a61e..3b9cbb2f9dae 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileModifiableModel.kt
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileModifiableModel.kt
@@ -95,7 +95,6 @@ open class InspectionProfileModifiableModel(val source: InspectionProfileImpl) :
   //invoke when isChanged() == true
   fun commit() {
     source.commit(this)
-    profileManager.updateProfile(source)
     modified = false
   }
 
@@ -120,4 +119,5 @@ inline fun InspectionProfileImpl.edit(task: InspectionProfileModifiableModel.()
   val model = InspectionProfileModifiableModel(this)
   model.task()
   model.commit()
+  profileManager.fireProfileChanged(this)
 }
diff --git a/platform/analysis-impl/src/com/intellij/profile/codeInspection/BaseInspectionProfileManager.kt b/platform/analysis-impl/src/com/intellij/profile/codeInspection/BaseInspectionProfileManager.kt
index 4a3f3453843d..a17c5301a851 100644
--- a/platform/analysis-impl/src/com/intellij/profile/codeInspection/BaseInspectionProfileManager.kt
+++ b/platform/analysis-impl/src/com/intellij/profile/codeInspection/BaseInspectionProfileManager.kt
@@ -24,7 +24,6 @@ import com.intellij.openapi.options.SchemeManager
 import com.intellij.openapi.options.SchemeState
 import com.intellij.openapi.project.Project
 import com.intellij.util.messages.MessageBus
-import org.jetbrains.annotations.TestOnly
 
 @JvmField
 internal val LOG = Logger.getInstance(BaseInspectionProfileManager::class.java)
@@ -44,7 +43,6 @@ abstract class BaseInspectionProfileManager(messageBus: MessageBus) :  Inspectio
     }
   }
 
-  @TestOnly
   fun addProfile(profile: InspectionProfileImpl) {
     schemeManager.addScheme(profile)
   }
@@ -64,11 +62,6 @@ abstract class BaseInspectionProfileManager(messageBus: MessageBus) :  Inspectio
   open protected fun schemeRemoved(scheme: InspectionProfile) {
   }
 
-  open fun updateProfile(profile: InspectionProfileImpl) {
-    schemeManager.addScheme(profile)
-    fireProfileChanged(profile)
-  }
-
   abstract fun fireProfileChanged(profile: InspectionProfileImpl)
 }
 
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 dbd1e2b2cc2d..0ddf1995966a 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
@@ -1124,6 +1124,9 @@ public class SingleInspectionProfilePanel extends JPanel {
     }
 
     selectedProfile.commit();
+    profileManager.addProfile(source);
+    profileManager.fireProfileChanged(source);
+
     myModified = false;
     myRoot.dropCache();
     initToolStates();