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

GradleScriptDefaultDependenciesProvider: better name filter

Browse Source
This commit is contained in:
Pavel V. Talanov
2017-10-19 17:36:30 +03:00
parent df74fb23f8
commit f063254cc1
1 changed files with 3 additions and 4 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
+3 -4
View File
@@ -22,7 +22,6 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import org.gradle.tooling.ProjectConnection 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.KotlinLexer
import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.script.ScriptTemplatesProvider import org.jetbrains.kotlin.script.ScriptTemplatesProvider
@@ -170,17 +169,17 @@ fun topLevelSectionCodeTextTokens(script: CharSequence, sectionIdentifier: Strin
.map { it.tokenSequence } .map { it.tokenSequence }
private const val KOTLIN_BUILD_FILE_NAME = DEFAULT_SCRIPT_NAME private const val KOTLIN_BUILD_FILE_SUFFIX = ".gradle.kts"
class GradleScriptDefaultDependenciesProvider( class GradleScriptDefaultDependenciesProvider(
private val scriptDependenciesCache: ScriptDependenciesCache private val scriptDependenciesCache: ScriptDependenciesCache
) : DefaultScriptDependenciesProvider { ) : DefaultScriptDependenciesProvider {
override fun defaultDependenciesFor(scriptFile: VirtualFile): ScriptDependencies? { 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() } return previouslyAnalyzedScriptsCombinedDependencies().takeUnless { it.classpath.isEmpty() }
} }
private fun previouslyAnalyzedScriptsCombinedDependencies() = private fun previouslyAnalyzedScriptsCombinedDependencies() =
scriptDependenciesCache.combineDependencies { it.name == KOTLIN_BUILD_FILE_NAME } scriptDependenciesCache.combineDependencies { it.name.endsWith(KOTLIN_BUILD_FILE_SUFFIX) }
} }