From 8510a628b52706ce344807885604591d91b0ba1c Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Fri, 23 Mar 2018 16:17:10 +0300
Subject: [PATCH] IDEA-188265 Gradle options menu broken

---
 .../AbstractExternalProjectSettingsControl.java     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/settings/AbstractExternalProjectSettingsControl.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/settings/AbstractExternalProjectSettingsControl.java
index 5e362523a433..0e4ec51d3c55 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/settings/AbstractExternalProjectSettingsControl.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/settings/AbstractExternalProjectSettingsControl.java
@@ -56,6 +56,9 @@ public abstract class AbstractExternalProjectSettingsControl<S extends ExternalP
   private JBRadioButton myUseModuleGroupsRadioButton;
   @NotNull
   private final ExternalSystemSettingsControlCustomizer myCustomizer;
+  @SuppressWarnings("FieldCanBeLocal") // the field needed for the option rendering per linked project, see ExternalSystemUiUtil.showUi
+  @Nullable
+  private JPanel myOrganizeModuleNamesPanel;
 
   protected AbstractExternalProjectSettingsControl(@NotNull S initialSettings) {
     this(null, initialSettings, null);
@@ -87,16 +90,16 @@ public abstract class AbstractExternalProjectSettingsControl<S extends ExternalP
     }
 
     if (!myCustomizer.isModulesGroupingOptionPanelHidden()) {
-      JPanel organizeModuleNamesPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-      organizeModuleNamesPanel.add(new JBLabel(ExternalSystemBundle.message("settings.label.group.modules")));
+      myOrganizeModuleNamesPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+      myOrganizeModuleNamesPanel.add(new JBLabel(ExternalSystemBundle.message("settings.label.group.modules")));
       myUseModuleGroupsRadioButton = new JBRadioButton(ExternalSystemBundle.message("settings.radio.button.use.module.groups"), true);
-      organizeModuleNamesPanel.add(myUseModuleGroupsRadioButton);
+      myOrganizeModuleNamesPanel.add(myUseModuleGroupsRadioButton);
       myUseQualifiedModuleNamesRadioButton = new JBRadioButton(ExternalSystemBundle.message("settings.radio.button.use.qualified.name"));
-      organizeModuleNamesPanel.add(myUseQualifiedModuleNamesRadioButton);
+      myOrganizeModuleNamesPanel.add(myUseQualifiedModuleNamesRadioButton);
       ButtonGroup group = new ButtonGroup();
       group.add(myUseModuleGroupsRadioButton);
       group.add(myUseQualifiedModuleNamesRadioButton);
-      canvas.add(organizeModuleNamesPanel, ExternalSystemUiUtil.getFillLineConstraints(indentLevel));
+      canvas.add(myOrganizeModuleNamesPanel, ExternalSystemUiUtil.getFillLineConstraints(indentLevel));
     }
     fillExtraControls(canvas, indentLevel); 
   }