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

Fix duplicated “Kotlin Script” definition for Gradle/Kotlin projects (KT-35096)

Browse Source 
^KT-35096 Fixed
This commit is contained in:
Natalia Selezneva
2019-11-26 11:59:38 +03:00
parent 153d894afb
commit 2e933507c6
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
+8
View File
@@ -306,6 +306,14 @@ class ScriptDefinitionSourceFromContributor(
get() = get() =
if (contributor is ScriptDefinitionsSource) contributor.definitions if (contributor is ScriptDefinitionsSource) contributor.definitions
else contributor.getDefinitions().asSequence().map { ScriptDefinition.FromLegacy(hostConfiguration, it) } else contributor.getDefinitions().asSequence().map { ScriptDefinition.FromLegacy(hostConfiguration, it) }
override fun equals(other: Any?): Boolean {
return contributor.id == (other as? ScriptDefinitionSourceFromContributor)?.contributor?.id
}
override fun hashCode(): Int {
return contributor.id.hashCode()
}
} }
fun ScriptDefinitionContributor.asSource(): ScriptDefinitionsSource = fun ScriptDefinitionContributor.asSource(): ScriptDefinitionsSource =