From d2edc0a0e854925086b79abd9a6d6dc8dd8f9f7d Mon Sep 17 00:00:00 2001
From: Alexander Doroshko <alexander.doroshko@jetbrains.com>
Date: Mon, 23 Mar 2020 00:37:53 +0300
Subject: [PATCH] IDEA-235710 Incorrect run configuration share location being
 shown in the run configuration editor

GitOrigin-RevId: 90524c9ab530d5f78e44e68f744693e431bdbc0c
---
 .../src/com/intellij/execution/impl/RunManagerImpl.kt          | 3 +++
 .../execution/impl/SingleConfigurationConfigurable.java        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/execution-impl/src/com/intellij/execution/impl/RunManagerImpl.kt b/platform/execution-impl/src/com/intellij/execution/impl/RunManagerImpl.kt
index e296e0cd11ff..090378c5d191 100644
--- a/platform/execution-impl/src/com/intellij/execution/impl/RunManagerImpl.kt
+++ b/platform/execution-impl/src/com/intellij/execution/impl/RunManagerImpl.kt
@@ -30,6 +30,7 @@ import com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.UnknownFeat
 import com.intellij.openapi.util.ClearableLazyValue
 import com.intellij.openapi.util.Condition
 import com.intellij.openapi.util.Key
+import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.project.isDirectoryBased
@@ -180,6 +181,8 @@ open class RunManagerImpl @JvmOverloads constructor(val project: Project, shared
                                                                                       schemeNameToFileName = OLD_NAME_CONVERTER,
                                                                                       streamProvider = sharedStreamProvider ?: schemeManagerIprProvider)
 
+  internal val dotIdeaRunConfigurationsPath get() = FileUtil.toSystemIndependentName(projectSchemeManager.rootDirectory.path)
+
   private val rcInArbitraryFileManager = RCInArbitraryFileManager(project)
 
   private val isFirstLoadState = AtomicBoolean(true)
diff --git a/platform/execution-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java b/platform/execution-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java
index 418591c36390..e381e4b615f2 100644
--- a/platform/execution-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java
+++ b/platform/execution-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java
@@ -456,7 +456,7 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
   private static String getDotIdeaStoragePath(@NotNull Project project) {
     // notNullize is to make inspections happy. Paths can't be null for non-default project
     return ProjectKt.isDirectoryBased(project)
-           ? StringUtil.notNullize(project.getBasePath()) + "/.idea/runConfigurations"
+           ? RunManagerImpl.getInstanceImpl(project).getDotIdeaRunConfigurationsPath$intellij_platform_execution_impl()
            : StringUtil.notNullize(project.getProjectFilePath());
   }