From 8fc913243fc0dc8986d4abab3eee5f73e518d189 Mon Sep 17 00:00:00 2001
From: Eldar Abusalimov <eldar.abusalimov@jetbrains.com>
Date: Fri, 21 Feb 2020 06:07:06 +0300
Subject: [PATCH] IDEA-233549: run: Always expand macros in working directory
 field

GitOrigin-RevId: 9c104930990cd3cfa2ab03b021161eb29971c21c
---
 .../execution/util/ProgramParametersConfigurator.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/execution-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java b/platform/execution-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java
index d2fda90d8a89..f65dafbd29f7 100644
--- a/platform/execution-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java
+++ b/platform/execution-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java
@@ -45,7 +45,7 @@ public class ProgramParametersConfigurator {
     Project project = configuration.getProject();
     Module module = getModule(configuration);
 
-    final String parametersString = expandPathAndMacros(configuration.getProgramParameters(), project, module);
+    final String parametersString = expandPathAndMacros(configuration.getProgramParameters(), module, project);
     parameters.getProgramParametersList().addParametersString(parametersString);
 
     parameters.setWorkingDirectory(getWorkingDir(configuration, project, module));
@@ -61,7 +61,7 @@ public class ProgramParametersConfigurator {
   }
 
   @Nullable
-  public String expandPathAndMacros(String s, Project project, Module module) {
+  public String expandPathAndMacros(String s, Module module, Project project) {
     return expandMacros(expandPath(s, module, project),
                         projectContext(project, module));
   }
@@ -137,7 +137,7 @@ public class ProgramParametersConfigurator {
         return null;
       }
     }
-    workingDirectory = expandPath(workingDirectory, module, project);
+    workingDirectory = expandPathAndMacros(workingDirectory, module, project);
     if (!FileUtil.isAbsolutePlatformIndependent(workingDirectory) && defaultWorkingDir != null) {
       if (PathMacroUtil.DEPRECATED_MODULE_DIR.equals(workingDirectory)) {
         return defaultWorkingDir;