From f785d897ab7409a3b596aee4740ced455d8499bc Mon Sep 17 00:00:00 2001
From: Alexandr Evstigneev <Alexandr.Evstigneev@jetbrains.com>
Date: Wed, 6 Sep 2017 15:58:59 +0300
Subject: [PATCH] Fixed parent parameters inlining for environment variables

---
 platform/util/src/com/intellij/util/EnvironmentUtil.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/util/src/com/intellij/util/EnvironmentUtil.java b/platform/util/src/com/intellij/util/EnvironmentUtil.java
index bff480b2f32e..e6c3d33473c8 100644
--- a/platform/util/src/com/intellij/util/EnvironmentUtil.java
+++ b/platform/util/src/com/intellij/util/EnvironmentUtil.java
@@ -339,12 +339,15 @@ public class EnvironmentUtil {
   }
 
   public static void inlineParentOccurrences(@NotNull Map<String, String> envs) {
-    Map<String, String> parentParams = new HashMap<String, String>(System.getenv());
+    inlineParentOccurrences(envs, new HashMap<String, String>(System.getenv()));
+  }
+
+  public static void inlineParentOccurrences(@NotNull Map<String, String> envs, @NotNull Map<String, String> parentEnv) {
     for (Map.Entry<String, String> entry : envs.entrySet()) {
       String key = entry.getKey();
       String value = entry.getValue();
       if (value != null) {
-        String parentVal = parentParams.get(key);
+        String parentVal = parentEnv.get(key);
         if (parentVal != null && containsEnvKeySubstitution(key, value)) {
           envs.put(key, value.replace("$" + key + "$", parentVal));
         }