From 7ee7ea94e860505a0b4a55314e4540ddec3505b4 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 22 Jan 2018 13:50:14 +0100
Subject: [PATCH] extract ProjectUtilCore.isUseExternalStorage()

---
 .../service/project/manage/ExternalProjectsState.java       | 3 ++-
 .../src/com/intellij/openapi/project/ProjectUtilCore.kt     | 6 ++++--
 .../plugins/gradle/settings/GradleProjectSettings.java      | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsState.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsState.java
index 24cb5f62dbd1..2ddcf7c7c1c1 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsState.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsState.java
@@ -2,6 +2,7 @@
 package com.intellij.openapi.externalSystem.service.project.manage;
 
 import com.intellij.openapi.externalSystem.view.ExternalProjectsViewState;
+import com.intellij.openapi.project.ProjectUtilCore;
 import com.intellij.util.containers.FactoryMap;
 import com.intellij.util.xmlb.annotations.Attribute;
 import com.intellij.util.xmlb.annotations.MapAnnotation;
@@ -30,7 +31,7 @@ public class ExternalProjectsState {
   }
 
   @Attribute
-  public boolean storeExternally;
+  public boolean storeExternally = ProjectUtilCore.isUseExternalStorage();
 
   @Tag("state")
   public static class State {
diff --git a/platform/projectModel-api/src/com/intellij/openapi/project/ProjectUtilCore.kt b/platform/projectModel-api/src/com/intellij/openapi/project/ProjectUtilCore.kt
index b2bdc6e9e191..41cb58a5ad60 100644
--- a/platform/projectModel-api/src/com/intellij/openapi/project/ProjectUtilCore.kt
+++ b/platform/projectModel-api/src/com/intellij/openapi/project/ProjectUtilCore.kt
@@ -53,5 +53,7 @@ val Project.isExternalStorageEnabled: Boolean
   get() {
     val key = "com.intellij.openapi.externalSystem.service.project.manage.ExternalProjectsManager"
     val manager = picoContainer.getComponentInstance(key) as? ProjectFileStoreOptionManager ?: return false
-    return manager.isStoredExternally || Registry.`is`("store.imported.project.elements.separately", ApplicationManager.getApplication().isUnitTestMode)
-  }
\ No newline at end of file
+    return manager.isStoredExternally || isUseExternalStorage()
+  }
+
+fun isUseExternalStorage() = (ApplicationManager.getApplication()?.isUnitTestMode ?: false) || Registry.`is`("store.imported.project.elements.separately")
\ No newline at end of file
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleProjectSettings.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleProjectSettings.java
index 95ec4eb39513..655c8a25231c 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleProjectSettings.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleProjectSettings.java
@@ -3,6 +3,7 @@ package org.jetbrains.plugins.gradle.settings;
 
 import com.intellij.openapi.externalSystem.service.execution.ExternalSystemJdkUtil;
 import com.intellij.openapi.externalSystem.settings.ExternalProjectSettings;
+import com.intellij.openapi.project.ProjectUtilCore;
 import com.intellij.util.SmartList;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.xmlb.annotations.*;
@@ -17,7 +18,6 @@ import java.util.List;
  * @since 4/24/13 11:57 AM
  */
 public class GradleProjectSettings extends ExternalProjectSettings {
-
   @Nullable private String myGradleHome;
   @Nullable private String myGradleJvm = ExternalSystemJdkUtil.USE_PROJECT_JDK;
   @Nullable private DistributionType distributionType;
@@ -25,7 +25,7 @@ public class GradleProjectSettings extends ExternalProjectSettings {
   private boolean resolveModulePerSourceSet = true;
   @Nullable private CompositeBuild myCompositeBuild;
 
-  private boolean storeProjectFilesExternally = false;
+  private boolean storeProjectFilesExternally = ProjectUtilCore.isUseExternalStorage();
 
   @Nullable
   public String getGradleHome() {