azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not show warning when multiple Gradle Definitions are loaded

Browse Source 
This will happen when there are multiple gradle project linked to one IDEA project
andthey have different gradle versions
This commit is contained in:
Natalia Selezneva
2020-07-23 00:56:47 +03:00
parent a62f65940d
commit 8d1f9df802
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/script/configuration/MultipleScriptDefinitionsChecker.kt
+6 -8
View File
@@ -57,14 +57,12 @@ class MultipleScriptDefinitionsChecker(private val project: Project) : EditorNot
) )
} }
private fun areDefinitionsForGradleKts(allApplicableDefinitions: List<ScriptDefinition>): Boolean = private fun areDefinitionsForGradleKts(allApplicableDefinitions: List<ScriptDefinition>): Boolean {
if (allApplicableDefinitions.size == 2) { return allApplicableDefinitions.all {
(allApplicableDefinitions[0].asLegacyOrNull<KotlinScriptDefinitionFromAnnotatedTemplate>()?.scriptFilePattern val pattern = it.asLegacyOrNull<KotlinScriptDefinitionFromAnnotatedTemplate>()?.scriptFilePattern?.pattern
?.pattern == "^(settings|.+\\.settings)\\.gradle\\.kts\$" && pattern == ".*\\.gradle\\.kts" || pattern == "^(settings|.+\\.settings)\\.gradle\\.kts\$" || pattern == ".+\\.init\\.gradle\\.kts"
allApplicableDefinitions[1].asLegacyOrNull<KotlinScriptDefinitionFromAnnotatedTemplate>()?.scriptFilePattern }
?.pattern == ".*\\.gradle\\.kts") }
} else
false
companion object { companion object {
private val KEY = Key.create<EditorNotificationPanel>("MultipleScriptDefinitionsChecker") private val KEY = Key.create<EditorNotificationPanel>("MultipleScriptDefinitionsChecker")