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

Rearrange script templates in GradleScriptTemplateProvider

Browse Source 
#KT-22473 Fixed
This commit is contained in:
Natalia Selezneva
2018-01-25 13:23:24 +03:00
parent b091500adc
commit c251386fc3
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt
+8 -6
View File
@@ -82,15 +82,17 @@ class GradleScriptDefinitionsContributor(private val project: Project): ScriptDe
private fun loadDefinitions(): List<KotlinScriptDefinition> { private fun loadDefinitions(): List<KotlinScriptDefinition> {
val kotlinDslDependencySelector = Regex("^gradle-(?:kotlin-dsl|core).*\\.jar\$") val kotlinDslDependencySelector = Regex("^gradle-(?:kotlin-dsl|core).*\\.jar\$")
val kotlinDslAdditionalResolverCp = ::kotlinStdlibAndCompiler val kotlinDslAdditionalResolverCp = ::kotlinStdlibAndCompiler
// KotlinBuildScript should be last because it has wide scriptFilePattern
val kotlinDslTemplates = loadGradleTemplates( val kotlinDslTemplates = loadGradleTemplates(
templateClass = "org.gradle.kotlin.dsl.KotlinBuildScript", templateClass = "org.gradle.kotlin.dsl.KotlinSettingsScript",
dependencySelector = kotlinDslDependencySelector, dependencySelector = kotlinDslDependencySelector,
additionalResolverClasspath = kotlinDslAdditionalResolverCp additionalResolverClasspath = kotlinDslAdditionalResolverCp
) + loadGradleTemplates( ) + loadGradleTemplates(
templateClass = "org.gradle.kotlin.dsl.KotlinSettingsScript", templateClass = "org.gradle.kotlin.dsl.KotlinBuildScript",
dependencySelector = kotlinDslDependencySelector, dependencySelector = kotlinDslDependencySelector,
additionalResolverClasspath = kotlinDslAdditionalResolverCp additionalResolverClasspath = kotlinDslAdditionalResolverCp
) )
if (kotlinDslTemplates.isNotEmpty()) { if (kotlinDslTemplates.isNotEmpty()) {
return kotlinDslTemplates return kotlinDslTemplates