From e70639e30dc710e63b5e9dc35247bf0399aabccd Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 9 Sep 2019 11:15:07 +0200
Subject: [PATCH] IDEA-222246 Inspection settings are not saved

GitOrigin-RevId: 3b5861997ad435d6de53f6db34b9caa9963c5854
---
 .../codeInspection/ex/InspectionProfileTest.java | 16 ++++++++++++++--
 .../intellij/codeInspection/InspectionEP.java    |  8 +++++---
 .../serviceContainer/BaseKeyedLazyInstance.java  |  7 +------
 3 files changed, 20 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 847651233c3f..0fc35a8c2708 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
@@ -591,8 +591,20 @@ public class InspectionProfileTest extends LightIdeaTestCase {
       inspectionTool.CLASS = false;
     });
     String mergedText = "<profile version=\"1.0\">\n" +
-                        "  <option name=\"myName\" value=\"ToConvert\" />\n" +
-                        "</profile>";
+                            "  <option name=\"myName\" value=\"ToConvert\" />\n" +
+                            "  <inspection_tool class=\"unused\" enabled=\"true\" level=\"WARNING\" enabled_by_default=\"true\">\n" +
+                            "    <option name=\"LOCAL_VARIABLE\" value=\"true\" />\n" +
+                            "    <option name=\"FIELD\" value=\"true\" />\n" +
+                            "    <option name=\"METHOD\" value=\"true\" />\n" +
+                            "    <option name=\"CLASS\" value=\"false\" />\n" +
+                            "    <option name=\"PARAMETER\" value=\"true\" />\n" +
+                            "    <option name=\"REPORT_PARAMETER_FOR_PUBLIC_METHODS\" value=\"true\" />\n" +
+                            "    <option name=\"ADD_MAINS_TO_ENTRIES\" value=\"true\" />\n" +
+                            "    <option name=\"ADD_APPLET_TO_ENTRIES\" value=\"true\" />\n" +
+                            "    <option name=\"ADD_SERVLET_TO_ENTRIES\" value=\"true\" />\n" +
+                            "    <option name=\"ADD_NONJAVA_TO_ENTRIES\" value=\"false\" />\n" +
+                            "  </inspection_tool>\n" +
+                            "</profile>";
     assertEquals(mergedText, serialize(profile));
   }
 
diff --git a/platform/analysis-api/src/com/intellij/codeInspection/InspectionEP.java b/platform/analysis-api/src/com/intellij/codeInspection/InspectionEP.java
index 0a877d21f2f5..ac9ccc2cd9ab 100644
--- a/platform/analysis-api/src/com/intellij/codeInspection/InspectionEP.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/InspectionEP.java
@@ -8,6 +8,7 @@ import com.intellij.diagnostic.PluginException;
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.lang.Language;
 import com.intellij.lang.LanguageExtensionPoint;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.util.text.StringUtil;
@@ -25,6 +26,8 @@ import java.util.ResourceBundle;
  * @see LocalInspectionEP
  */
 public class InspectionEP extends LanguageExtensionPoint<InspectionProfileEntry> implements InspectionProfileEntry.DefaultNameProvider {
+  private static final Logger LOG = Logger.getInstance(InspectionEP.class);
+
   /**
    * @see GlobalInspectionTool
    */
@@ -185,11 +188,10 @@ public class InspectionEP extends LanguageExtensionPoint<InspectionProfileEntry>
     return CommonBundle.message(resourceBundle, key);
   }
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.InspectionEP");
-
   @NotNull
   public InspectionProfileEntry instantiateTool() {
-    InspectionProfileEntry entry = getInstance();
+    // must create a new instance for each invocation
+    InspectionProfileEntry entry = createInstance(ApplicationManager.getApplication());
     entry.myNameProvider = this;
     return entry;
   }
diff --git a/platform/core-api/src/com/intellij/serviceContainer/BaseKeyedLazyInstance.java b/platform/core-api/src/com/intellij/serviceContainer/BaseKeyedLazyInstance.java
index 6bf9bf9cf995..acf32057b7cd 100644
--- a/platform/core-api/src/com/intellij/serviceContainer/BaseKeyedLazyInstance.java
+++ b/platform/core-api/src/com/intellij/serviceContainer/BaseKeyedLazyInstance.java
@@ -24,11 +24,6 @@ public abstract class BaseKeyedLazyInstance<T> implements PluginAware {
 
   @NotNull
   public final T getInstance() {
-    return getInstance(ApplicationManager.getApplication());
-  }
-
-  @NotNull
-  protected final T getInstance(@NotNull ComponentManager componentManager) {
     T result = instance;
     if (result != null) {
       return result;
@@ -41,7 +36,7 @@ public abstract class BaseKeyedLazyInstance<T> implements PluginAware {
         return result;
       }
 
-      result = createInstance(componentManager);
+      result = createInstance(ApplicationManager.getApplication());
       instance = result;
     }
     return result;