From 4a900f191d94f008c2877f8751e27bef6a5692aa Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 13 Oct 2015 19:08:08 +0200
Subject: [PATCH] separate inspection profile wrappers based on local and
 shared profiles to avoid conflicts when same names are used (IDEA-97051)

---
 .../ex/InspectionProfileTest.java             | 21 +++++++++++++
 .../profile/DefaultProjectProfileManager.java |  4 ++-
 .../InspectionProjectProfileManagerImpl.java  | 30 +++++++++++++++----
 3 files changed, 49 insertions(+), 6 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 6221c1ddfb65..4241253dbb2f 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
@@ -81,6 +81,27 @@ public class InspectionProfileTest extends LightIdeaTestCase {
     return new InspectionProfileImpl(PROFILE, InspectionToolRegistrar.getInstance(), InspectionProfileManager.getInstance(), base);
   }
 
+  public void testSameNameSharedProfile() throws Exception {
+    InspectionProfileManager profileManager = InspectionProfileManager.getInstance();
+    InspectionProfileImpl localProfile = createProfile();
+    profileManager.updateProfile(localProfile);
+
+    InspectionProjectProfileManager projectProfileManager = InspectionProjectProfileManager.getInstance(getProject());
+    try {
+      //normally on open project profile wrappers are init for both managers
+      profileManager.updateProfile(localProfile);
+      InspectionProfileImpl profile = new InspectionProfileImpl(PROFILE, InspectionToolRegistrar.getInstance(), projectProfileManager,
+                                                                InspectionProfileImpl.getDefaultProfile());
+      projectProfileManager.updateProfile(profile);
+      projectProfileManager.setProjectProfile(profile.getName());
+
+      assertTrue(projectProfileManager.getInspectionProfile() == profile);
+    }
+    finally {
+      projectProfileManager.deleteProfile(PROFILE);
+    }
+  }
+
   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-api/src/com/intellij/profile/DefaultProjectProfileManager.java b/platform/analysis-api/src/com/intellij/profile/DefaultProjectProfileManager.java
index cfcf716c13e0..275fea67cc81 100644
--- a/platform/analysis-api/src/com/intellij/profile/DefaultProjectProfileManager.java
+++ b/platform/analysis-api/src/com/intellij/profile/DefaultProjectProfileManager.java
@@ -227,7 +227,9 @@ public abstract class DefaultProjectProfileManager extends ProjectProfileManager
       setProjectProfile(myProfiles.keySet().iterator().next());
     }
     final Profile profile = myProfiles.get(myProjectProfile);
-    profile.setProfileManager(this);
+    if (profile.isProjectLevel()) {
+      profile.setProfileManager(this);
+    }
     return profile;
   }
 
diff --git a/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManagerImpl.java b/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManagerImpl.java
index c8069ca96fed..c64f5c77ac8c 100644
--- a/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManagerImpl.java
+++ b/platform/analysis-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManagerImpl.java
@@ -57,6 +57,7 @@ import java.util.concurrent.ConcurrentHashMap;
 )
 public class InspectionProjectProfileManagerImpl extends InspectionProjectProfileManager {
   private final Map<String, InspectionProfileWrapper>  myName2Profile = new ConcurrentHashMap<String, InspectionProfileWrapper>();
+  private final Map<String, InspectionProfileWrapper>  myAppName2Profile = new ConcurrentHashMap<String, InspectionProfileWrapper>();
   private final SeverityRegistrar mySeverityRegistrar;
   private final NamedScopeManager myLocalScopesHolder;
   private NamedScopesHolder.ScopeListener myScopeListener;
@@ -76,17 +77,27 @@ public class InspectionProjectProfileManagerImpl extends InspectionProjectProfil
 
   @Override
   public boolean isProfileLoaded() {
-    return myName2Profile.containsKey(getInspectionProfile().getName());
+    final InspectionProfile profile = getInspectionProfile();
+    final String name = profile.getName();
+    return profile.getProfileManager() == this ? myName2Profile.containsKey(name) : myAppName2Profile.containsKey(name);
   }
 
   @NotNull
   public synchronized InspectionProfileWrapper getProfileWrapper(){
     final InspectionProfile profile = getInspectionProfile();
     final String profileName = profile.getName();
-    if (!myName2Profile.containsKey(profileName)){
-      initProfileWrapper(profile);
+    if (profile.getProfileManager() == this) {
+      if (!myName2Profile.containsKey(profileName)){
+        initProfileWrapper(profile);
+      }
+      return myName2Profile.get(profileName);
+    }
+    else {
+      if (!myAppName2Profile.containsKey(profileName)) {
+        initProfileWrapper(profile);
+      }
+      return myAppName2Profile.get(profileName);
     }
-    return myName2Profile.get(profileName);
   }
 
   public InspectionProfileWrapper getProfileWrapper(final String profileName){
@@ -163,7 +174,13 @@ public class InspectionProjectProfileManagerImpl extends InspectionProjectProfil
   public void initProfileWrapper(@NotNull Profile profile) {
     final InspectionProfileWrapper wrapper = new InspectionProfileWrapper((InspectionProfile)profile);
     wrapper.init(myProject);
-    myName2Profile.put(profile.getName(), wrapper);
+    String profileName = profile.getName();
+    if (profile.getProfileManager() == this) {
+      myName2Profile.put(profileName, wrapper);
+    }
+    else {
+      myAppName2Profile.put(profileName, wrapper);
+    }
   }
 
   @Override
@@ -175,6 +192,9 @@ public class InspectionProjectProfileManagerImpl extends InspectionProjectProfil
         for (InspectionProfileWrapper wrapper : myName2Profile.values()) {
           wrapper.cleanup(myProject);
         }
+        for (InspectionProfileWrapper wrapper : myAppName2Profile.values()) {
+          wrapper.cleanup(myProject);
+        }
         fireProfilesShutdown();
       }
     };