From 1c15d0c27d01c9afd3ec7d50421128ab84d1cebd Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Thu, 20 Dec 2018 08:27:56 +0300
Subject: [PATCH] ES: honor the current project during the settings control
 reset

---
 .../service/execution/ExternalSystemEditTaskDialog.java       | 4 +++-
 .../execution/ExternalSystemRunConfigurationEditor.java       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemEditTaskDialog.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemEditTaskDialog.java
index f1c0d66a1520..b1429549d6d7 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemEditTaskDialog.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemEditTaskDialog.java
@@ -32,11 +32,13 @@ public class ExternalSystemEditTaskDialog extends DialogWrapper {
   @NotNull private final ExternalSystemTaskExecutionSettings myTaskExecutionSettings;
   @NotNull private final ExternalSystemTaskSettingsControl myControl;
   @Nullable private JComponent contentPane;
+  @NotNull private final Project myProject;
 
   public ExternalSystemEditTaskDialog(@NotNull Project project,
                                       @NotNull ExternalSystemTaskExecutionSettings taskExecutionSettings,
                                       @NotNull ProjectSystemId externalSystemId) {
     super(project, true);
+    myProject = project;
     myTaskExecutionSettings = taskExecutionSettings;
 
     setTitle(ExternalSystemBundle.message("tasks.edit.task.title", externalSystemId.getReadableName()));
@@ -51,7 +53,7 @@ public class ExternalSystemEditTaskDialog extends DialogWrapper {
     if (contentPane == null) {
       contentPane = new PaintAwarePanel(new GridBagLayout());
       myControl.fillUi((PaintAwarePanel)contentPane, 0);
-      myControl.reset();
+      myControl.reset(myProject);
     }
     return contentPane;
   }
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfigurationEditor.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfigurationEditor.java
index 58d372990461..802f3be75dc0 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfigurationEditor.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfigurationEditor.java
@@ -40,7 +40,7 @@ public class ExternalSystemRunConfigurationEditor extends SettingsEditor<Externa
   @Override
   protected void resetEditorFrom(@NotNull ExternalSystemRunConfiguration s) {
     myControl.setOriginalSettings(s.getSettings());
-    myControl.reset();
+    myControl.reset(s.getProject());
   }
 
   @Override