From 339f945ce032c486a37df5322e483a1cb86f0d37 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Sat, 9 Apr 2016 14:39:11 +0200 Subject: [PATCH] Implement searching for config files in th whole project directory tree --- .../kotlin/script/KotlinScriptConfigurationManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptConfigurationManager.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptConfigurationManager.kt index 952a81ffa90..23da1e2c928 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptConfigurationManager.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptConfigurationManager.kt @@ -51,8 +51,8 @@ class KotlinScriptConfigurationManager(project: Project, scriptDefinitionProvide } fun loadScriptDefinitionsFromDirectoryWithConfigs(dir: File): List = - dir.listFiles { file -> file.name.endsWith(SCRIPT_CONFIG_FILE_EXTENSION, ignoreCase = true) } - .flatMap (::loadScriptDefinitionsFromConfig) + dir.walk().filter { it.isFile && it.name.endsWith(SCRIPT_CONFIG_FILE_EXTENSION, ignoreCase = true) }.toList() + .flatMap ( ::loadScriptDefinitionsFromConfig ) fun loadScriptDefinitionsFromConfig(configFile: File): List = JDOMUtil.loadDocument(configFile).rootElement.children.mapNotNull {