From 9eeae05a56c0be8d034ae3625ac9cd23305bf6f3 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Tue, 27 Jun 2017 13:45:41 +0300
Subject: [PATCH] IDEA-175047 External System: import modules dialog

---
 .../settings/AbstractExternalSystemSettings.java             | 5 +++++
 .../project/wizard/AbstractExternalProjectImportBuilder.java | 2 +-
 .../service/project/wizard/GradleProjectImportBuilder.java   | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java
index 2d0411a9e666..0b0108fac4a3 100644
--- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java
+++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.externalSystem.model.ProjectSystemId;
 import com.intellij.openapi.externalSystem.service.execution.ProgressExecutionMode;
 import com.intellij.openapi.externalSystem.service.project.manage.ExternalProjectsManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.util.SystemProperties;
 import com.intellij.util.containers.ContainerUtilRt;
 import com.intellij.util.messages.Topic;
 import org.jetbrains.annotations.NotNull;
@@ -69,6 +70,10 @@ public abstract class AbstractExternalSystemSettings<
     return myProject;
   }
 
+  public boolean showSelectiveImportDialogOnInitialImport() {
+    return SystemProperties.is("external.system.show.selective.import.dialog");
+  }
+
   /**
    * Every time particular external system setting is changed corresponding message is sent via ide
    * <a href="https://confluence.jetbrains.com/display/IDEADEV/IntelliJ+IDEA+Messaging+infrastructure">messaging sub-system</a>.
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java
index 4458a5a35f26..0ae14ea8ed42 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java
@@ -183,7 +183,7 @@ public abstract class AbstractExternalProjectImportBuilder<C extends AbstractImp
     systemSettings.setLinkedProjectsSettings(projects);
 
     if (externalProjectNode != null) {
-      if(!ApplicationManager.getApplication().isHeadlessEnvironment()) {
+      if (systemSettings.showSelectiveImportDialogOnInitialImport() && !ApplicationManager.getApplication().isHeadlessEnvironment()) {
         ExternalProjectDataSelectorDialog dialog = new ExternalProjectDataSelectorDialog(
           project, new InternalExternalProjectInfo(myExternalSystemId, projectSettings.getExternalProjectPath(), externalProjectNode));
         if (dialog.hasMultipleDataToSelect()) {
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleProjectImportBuilder.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleProjectImportBuilder.java
index 4d891072282e..a00be1aeb9a6 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleProjectImportBuilder.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleProjectImportBuilder.java
@@ -41,6 +41,7 @@ import icons.GradleIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.gradle.service.settings.ImportFromGradleControl;
+import org.jetbrains.plugins.gradle.settings.GradleSettings;
 import org.jetbrains.plugins.gradle.util.GradleBundle;
 import org.jetbrains.plugins.gradle.util.GradleConstants;
 
@@ -113,7 +114,8 @@ public class GradleProjectImportBuilder extends AbstractExternalProjectImportBui
 
         Runnable importTask = () -> ServiceManager.getService(ProjectDataManager.class).importData(externalProject, project, false);
 
-        if (!ApplicationManager.getApplication().isHeadlessEnvironment()) {
+        boolean showSelectiveImportDialog = GradleSettings.getInstance(project).showSelectiveImportDialogOnInitialImport();
+        if (showSelectiveImportDialog && !ApplicationManager.getApplication().isHeadlessEnvironment()) {
           ApplicationManager.getApplication().invokeLater(() -> {
             selectDataTask.run();
             ApplicationManager.getApplication().executeOnPooledThread(importTask);