MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-233549: run: Always expand macros in working directory field

Browse Source 
GitOrigin-RevId: 9c104930990cd3cfa2ab03b021161eb29971c21c
This commit is contained in:
Eldar Abusalimov
2020-02-25 02:05:53 +00:00
committed by intellij-monorepo-bot
parent c6cf173b40
commit 8fc913243f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/execution-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java
+3 -3
View File
@@ -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;