From f063254cc128f1a18d7aada94c3991e725b9dd3e Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 19 Oct 2017 17:36:30 +0300 Subject: [PATCH] GradleScriptDefaultDependenciesProvider: better name filter --- .../idea/core/script/GradleScriptTemplateProvider.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt index d2081fb0baf..7ded24c291a 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt @@ -22,7 +22,6 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import org.gradle.tooling.ProjectConnection -import org.jetbrains.kotlin.gradle.kdsl.DEFAULT_SCRIPT_NAME import org.jetbrains.kotlin.lexer.KotlinLexer import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.script.ScriptTemplatesProvider @@ -170,17 +169,17 @@ fun topLevelSectionCodeTextTokens(script: CharSequence, sectionIdentifier: Strin .map { it.tokenSequence } -private const val KOTLIN_BUILD_FILE_NAME = DEFAULT_SCRIPT_NAME +private const val KOTLIN_BUILD_FILE_SUFFIX = ".gradle.kts" class GradleScriptDefaultDependenciesProvider( private val scriptDependenciesCache: ScriptDependenciesCache ) : DefaultScriptDependenciesProvider { override fun defaultDependenciesFor(scriptFile: VirtualFile): ScriptDependencies? { - if (scriptFile.name != KOTLIN_BUILD_FILE_NAME) return null + if (scriptFile.name != KOTLIN_BUILD_FILE_SUFFIX) return null return previouslyAnalyzedScriptsCombinedDependencies().takeUnless { it.classpath.isEmpty() } } private fun previouslyAnalyzedScriptsCombinedDependencies() = - scriptDependenciesCache.combineDependencies { it.name == KOTLIN_BUILD_FILE_NAME } + scriptDependenciesCache.combineDependencies { it.name.endsWith(KOTLIN_BUILD_FILE_SUFFIX) } }