From cc580ca1dce86b9f60fe3bda56f499c5bad498be Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Mon, 20 Nov 2017 18:08:50 +0300
Subject: [PATCH] optimize check of module-per-source-set

---
 .../idea/configuration/KotlinGradleProjectResolverExtension.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt
index 9e7790aeda5..d03291288c0 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt
@@ -53,6 +53,8 @@ var DataNode<out ModuleData>.implementedModuleName
         by CopyableDataNodeUserDataProperty(Key.create<String>("IMPLEMENTED_MODULE_NAME"))
 
 class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension() {
+    val isAndroidProjectKey = Key.findKeyByName("IS_ANDROID_PROJECT_KEY")
+
     override fun getToolingExtensionsClasses(): Set<Class<out Any>> {
         return setOf(KotlinGradleModelBuilder::class.java, Unit::class.java)
     }
@@ -63,7 +65,6 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension()
 
     private fun useModulePerSourceSet(): Boolean {
         // See AndroidGradleProjectResolver
-        val isAndroidProjectKey = Key.findKeyByName("IS_ANDROID_PROJECT_KEY")
         if (isAndroidProjectKey != null && resolverCtx.getUserData(isAndroidProjectKey) == true) {
             return false
         }