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

Do not show duplicated error gradle templates in settings

Browse Source 
^KT-34530 Fixed
This commit is contained in:
Natalia Selezneva
2019-11-12 09:53:57 +03:00
parent d355a9f686
commit c40cd07cf0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptDefinitionsProvider.kt
+6 -5
View File
@@ -77,7 +77,7 @@ class GradleScriptDefinitionsContributor(private val project: Project) : ScriptD
failedToLoad.set(false) failedToLoad.set(false)
val kotlinDslTemplates = LinkedHashSet<ScriptDefinition>() val kotlinDslTemplates = ArrayList<ScriptDefinition>()
loadGradleTemplates( loadGradleTemplates(
templateClass = "org.gradle.kotlin.dsl.KotlinInitScript", templateClass = "org.gradle.kotlin.dsl.KotlinInitScript",
@@ -102,12 +102,12 @@ class GradleScriptDefinitionsContributor(private val project: Project) : ScriptD
if (kotlinDslTemplates.isNotEmpty()) { if (kotlinDslTemplates.isNotEmpty()) {
return kotlinDslTemplates.asSequence() return kotlinDslTemplates.distinct().asSequence()
} }
val default = tryToLoadOldBuildScriptDefinition() val default = tryToLoadOldBuildScriptDefinition()
if (default.isNotEmpty()) { if (default.isNotEmpty()) {
return default.asSequence() return default.distinct().asSequence()
} }
return sequenceOf(ErrorGradleScriptDefinition()) return sequenceOf(ErrorGradleScriptDefinition())
@@ -261,9 +261,10 @@ class GradleScriptDefinitionsContributor(private val project: Project) : ScriptD
) )
override fun toString(): String = "ErrorGradleScriptDefinition" 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 { private class ErrorScriptDependenciesResolver(private val message: String? = null) : DependenciesResolver {