From 65af13711779c788f39e5150585dce3572a0e11e Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 27 Feb 2018 18:06:55 +0100 Subject: [PATCH] (minor) Fix script templates from setting processing --- .../script/scriptTemplatesFromCompilerSettings.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/script/scriptTemplatesFromCompilerSettings.kt b/idea/src/org/jetbrains/kotlin/idea/script/scriptTemplatesFromCompilerSettings.kt index 71ffd917e2c..9b673849021 100644 --- a/idea/src/org/jetbrains/kotlin/idea/script/scriptTemplatesFromCompilerSettings.kt +++ b/idea/src/org/jetbrains/kotlin/idea/script/scriptTemplatesFromCompilerSettings.kt @@ -28,7 +28,7 @@ import java.io.File class ScriptTemplatesFromCompilerSettingsProvider(private val project: Project) : ScriptDefinitionContributor { init { - project.messageBus.connect().subscribe(KotlinCompilerSettingsListener.TOPIC, object: KotlinCompilerSettingsListener { + project.messageBus.connect().subscribe(KotlinCompilerSettingsListener.TOPIC, object : KotlinCompilerSettingsListener { override fun settingsChanged(newSettings: T) { if (newSettings !is CompilerSettings) return @@ -39,12 +39,13 @@ class ScriptTemplatesFromCompilerSettingsProvider(private val project: Project) override fun getDefinitions(): List { val kotlinSettings = KotlinCompilerSettings.getInstance(project).settings - return loadDefinitionsFromTemplates( - templateClassNames = kotlinSettings.scriptTemplates.split(',', ' '), - templateClasspath = kotlinSettings.scriptTemplatesClasspath.split(File.pathSeparator).map(::File), - environment = mapOf( - "projectRoot" to (project.basePath ?: project.baseDir.canonicalPath)?.let(::File)) - + return if (kotlinSettings.scriptTemplates.isBlank()) emptyList() + else loadDefinitionsFromTemplates( + templateClassNames = kotlinSettings.scriptTemplates.split(',', ' '), + templateClasspath = kotlinSettings.scriptTemplatesClasspath.split(File.pathSeparator).map(::File), + environment = mapOf( + "projectRoot" to (project.basePath ?: project.baseDir.canonicalPath)?.let(::File) + ) ) }