From 72ef43f46272556029f0104616db4a55543523a6 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Tue, 12 Nov 2019 11:02:36 +0300 Subject: [PATCH] Show filePattern in settings for new script definitions if present --- .../idea/script/configuration/KotlinScriptDefinitionsModel.kt | 3 ++- .../jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptDefinitionsModel.kt b/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptDefinitionsModel.kt index ca0e9537916..f6d5bd6bee0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptDefinitionsModel.kt +++ b/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptDefinitionsModel.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -40,6 +40,7 @@ class KotlinScriptDefinitionsModel private constructor(definitions: MutableList< override fun valueOf(item: KotlinScriptDefinitionsModelDescriptor): String { val definition = item.definition return definition.asLegacyOrNull()?.scriptFilePattern?.pattern + ?: (definition as? ScriptDefinition.FromConfigurations)?.filePathPattern ?: "." + definition.fileExtension } } diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt index 9a197afbaee..3d719b921f8 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt @@ -126,7 +126,7 @@ abstract class ScriptDefinition : UserDataHolderBase() { ) } - private val filePathPattern by lazy { + val filePathPattern by lazy { compilationConfiguration[ScriptCompilationConfiguration.filePathPattern]?.takeIf { it.isNotBlank() } }