From c40cd07cf0e4e066f6674c54d571c811e934bfa6 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Tue, 12 Nov 2019 09:53:57 +0300 Subject: [PATCH] Do not show duplicated error gradle templates in settings ^KT-34530 Fixed --- .../gradle/GradleScriptDefinitionsProvider.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptDefinitionsProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptDefinitionsProvider.kt index 96a8e8ab51f..cdc6b1ae670 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptDefinitionsProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptDefinitionsProvider.kt @@ -77,7 +77,7 @@ class GradleScriptDefinitionsContributor(private val project: Project) : ScriptD failedToLoad.set(false) - val kotlinDslTemplates = LinkedHashSet() + val kotlinDslTemplates = ArrayList() loadGradleTemplates( templateClass = "org.gradle.kotlin.dsl.KotlinInitScript", @@ -102,12 +102,12 @@ class GradleScriptDefinitionsContributor(private val project: Project) : ScriptD if (kotlinDslTemplates.isNotEmpty()) { - return kotlinDslTemplates.asSequence() + return kotlinDslTemplates.distinct().asSequence() } val default = tryToLoadOldBuildScriptDefinition() if (default.isNotEmpty()) { - return default.asSequence() + return default.distinct().asSequence() } return sequenceOf(ErrorGradleScriptDefinition()) @@ -261,9 +261,10 @@ class GradleScriptDefinitionsContributor(private val project: Project) : ScriptD ) override fun toString(): String = "ErrorGradleScriptDefinition" - override fun equals(other: Any?): Boolean = other is ErrorGradleScriptDefinition - override fun hashCode(): Int = name.hashCode() } + + override fun equals(other: Any?): Boolean = other is ErrorGradleScriptDefinition + override fun hashCode(): Int = name.hashCode() } private class ErrorScriptDependenciesResolver(private val message: String? = null) : DependenciesResolver {