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

Provide dataContext to run configurations while running from Run popup (GO-7119)

Browse Source 
otherwise macros in Before task will be calculated incorrectly
This commit is contained in:
Alexander Zolotov
2019-03-25 19:23:33 +03:00
parent a54fab9bb8
commit 4326d3a4e7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java
+5 -5
View File
@@ -361,7 +361,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider {
RunnerAndConfigurationSettings config = getValue();
RunManager.getInstance(project).setSelectedConfiguration(config);
MacroManager.getInstance().cacheMacrosPreview(context);
ExecutionUtil.runConfiguration(config, executor);
ExecutionUtil.doRunConfiguration(config, executor, null, null, context);
}
@Override
@@ -1101,7 +1101,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider {
@Override
public void perform(@NotNull final Project project, @NotNull final Executor executor, @NotNull DataContext context) {
ExecutionTargetManager.setActiveTarget(project, getValue());
ExecutionUtil.runConfiguration(selectedConfiguration, executor);
ExecutionUtil.doRunConfiguration(selectedConfiguration, executor, null, null, context);
}
@Override
@@ -1142,7 +1142,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider {
ApplicationManager.getApplication().invokeLater(() -> {
RunnerAndConfigurationSettings configuration = RunManager.getInstance(project).getSelectedConfiguration();
if (configuration != null) {
ExecutionUtil.runConfiguration(configuration, executor);
ExecutionUtil.doRunConfiguration(configuration, executor, null, null, context);
}
}, project.getDisposed());
}
@@ -1179,7 +1179,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider {
int i = 2; // selectedConfiguration == null ? 1 : 2;
for (final ConfigurationFromContext fromContext : producers) {
final RunnerAndConfigurationSettings configuration = fromContext.getConfigurationSettings();
if (existing.keySet().contains(configuration)) {
if (existing.containsKey(configuration)) {
final ItemWrapper wrapper = existing.get(configuration);
if (wrapper.getMnemonic() != 1) {
wrapper.setMnemonic(i);
@@ -1214,7 +1214,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider {
public void perform(@NotNull Project project, @NotNull Executor executor, @NotNull DataContext context) {
manager.setTemporaryConfiguration(configuration);
RunManager.getInstance(project).setSelectedConfiguration(configuration);
ExecutionUtil.runConfiguration(configuration, executor);
ExecutionUtil.doRunConfiguration(configuration, executor, null, null, context);
}
@Override