From 6a4f756f40a91d5348c44252fac9f9bffc5fa63c Mon Sep 17 00:00:00 2001
From: Konstantin Aleev <konstantin.aleev@jetbrains.com>
Date: Tue, 12 Sep 2017 13:23:39 +0300
Subject: [PATCH] RunDashboard: reuse content only for run configuration itself

---
 .../execution/ui/RunContentManagerImpl.java    | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
index f200aea340bb..14efd938a419 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
@@ -272,7 +272,10 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
     }
 
     final ContentManager contentManager = getContentManagerForRunner(executor, descriptor);
-    RunContentDescriptor oldDescriptor = chooseReuseContentForDescriptor(contentManager, descriptor, executionId, descriptor.getDisplayName());
+    String toolWindowId = getToolWindowIdForRunner(executor, descriptor);
+    boolean chooseByPreferredName = RunDashboardManager.getInstance(myProject).getToolWindowId().equals(toolWindowId);
+    RunContentDescriptor oldDescriptor =
+      chooseReuseContentForDescriptor(contentManager, descriptor, executionId, descriptor.getDisplayName(), chooseByPreferredName);
     final Content content;
     if (oldDescriptor == null) {
       content = createNewContent(descriptor, executor);
@@ -292,7 +295,6 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
     content.setDisplayName(descriptor.getDisplayName());
     descriptor.setAttachedContent(content);
 
-    String toolWindowId = getToolWindowIdForRunner(executor, descriptor);
     final ToolWindow toolWindow = ToolWindowManager.getInstance(myProject).getToolWindow(toolWindowId);
     final ProcessHandler processHandler = descriptor.getProcessHandler();
     if (processHandler != null) {
@@ -372,13 +374,13 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
       return contentToReuse;
     }
 
-    // TODO [konstantin.aleev] Should content be reused in case of dashboard?
     String toolWindowId = getContentDescriptorToolWindowId(executionEnvironment.getRunnerAndConfigurationSettings());
     final ContentManager contentManager = toolWindowId == null ?
                                           getContentManagerForRunner(executionEnvironment.getExecutor(), null) :
                                           myToolwindowIdToContentManagerMap.get(toolWindowId);
+    boolean chooseByPreferredName = RunDashboardManager.getInstance(myProject).getToolWindowId().equals(toolWindowId);
     return chooseReuseContentForDescriptor(contentManager, null, executionEnvironment.getExecutionId(),
-                                           executionEnvironment.toString());
+                                           executionEnvironment.toString(), chooseByPreferredName);
   }
 
   @Override
@@ -409,7 +411,8 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
   private static RunContentDescriptor chooseReuseContentForDescriptor(@NotNull ContentManager contentManager,
                                                                       @Nullable RunContentDescriptor descriptor,
                                                                       long executionId,
-                                                                      @Nullable String preferredName) {
+                                                                      @Nullable String preferredName,
+                                                                      boolean chooseByPreferredName) {
     Content content = null;
     if (descriptor != null) {
       //Stage one: some specific descriptors (like AnalyzeStacktrace) cannot be reused at all
@@ -424,6 +427,8 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
           && contentManager.getIndexOfContent(attachedContent) != -1
           && (Comparing.equal(descriptor.getDisplayName(), attachedContent.getDisplayName()) || !attachedContent.isPinned())) {
         content = attachedContent;
+        // Content from descriptor itself should be applicable for reuse even if display names are different.
+        chooseByPreferredName = false;
       }
     }
     //Stage three: choose the content with name we prefer
@@ -433,6 +438,9 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
     if (content == null || !isTerminated(content) || (content.getExecutionId() == executionId && executionId != 0)) {
       return null;
     }
+    if (chooseByPreferredName && (preferredName == null || !preferredName.equals(content.getDisplayName()))) {
+        return null;
+    }
     final RunContentDescriptor oldDescriptor = getRunContentDescriptorByContent(content);
     if (oldDescriptor != null && !oldDescriptor.isContentReuseProhibited() ) {
       //content.setExecutionId(executionId);