From 8d1f9df802c9fd818e499e0395c963580a25fc57 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Thu, 23 Jul 2020 00:56:47 +0300 Subject: [PATCH] Do not show warning when multiple Gradle Definitions are loaded This will happen when there are multiple gradle project linked to one IDEA project andthey have different gradle versions --- .../MultipleScriptDefinitionsChecker.kt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/script/configuration/MultipleScriptDefinitionsChecker.kt b/idea/src/org/jetbrains/kotlin/idea/script/configuration/MultipleScriptDefinitionsChecker.kt index 9ba777f5876..3a7008bdc23 100644 --- a/idea/src/org/jetbrains/kotlin/idea/script/configuration/MultipleScriptDefinitionsChecker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/script/configuration/MultipleScriptDefinitionsChecker.kt @@ -57,14 +57,12 @@ class MultipleScriptDefinitionsChecker(private val project: Project) : EditorNot ) } - private fun areDefinitionsForGradleKts(allApplicableDefinitions: List): Boolean = - if (allApplicableDefinitions.size == 2) { - (allApplicableDefinitions[0].asLegacyOrNull()?.scriptFilePattern - ?.pattern == "^(settings|.+\\.settings)\\.gradle\\.kts\$" && - allApplicableDefinitions[1].asLegacyOrNull()?.scriptFilePattern - ?.pattern == ".*\\.gradle\\.kts") - } else - false + private fun areDefinitionsForGradleKts(allApplicableDefinitions: List): Boolean { + return allApplicableDefinitions.all { + val pattern = it.asLegacyOrNull()?.scriptFilePattern?.pattern + pattern == ".*\\.gradle\\.kts" || pattern == "^(settings|.+\\.settings)\\.gradle\\.kts\$" || pattern == ".+\\.init\\.gradle\\.kts" + } + } companion object { private val KEY = Key.create("MultipleScriptDefinitionsChecker")