From fbc5d64aaba9715f44e0868e7654060e128409ca Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 2 Aug 2016 17:48:41 +0300 Subject: [PATCH] gradleScriptTemplateProvider: fix NPE --- .../kotlin/idea/core/script/gradleScriptTemplateProvider.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt index a90ec97b1cb..483157b4a3f 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt @@ -47,8 +47,8 @@ class GradleScriptTemplateProvider(project: Project): ScriptTemplateProvider { } private val gradleJvmOptions: List by lazy { - gradleExeSettings?.let { settings -> - CommandLineTokenizer(settings.daemonVmOptions).toList() + gradleExeSettings?.daemonVmOptions?.let { vmOptions -> + CommandLineTokenizer(vmOptions).toList() .mapNotNull { it?.let { it as? String } } .filterNot { it.isBlank() } .distinct()