diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinScripting/script-template/src/main/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.test.GreetScriptTemplate b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinScripting/script-template/src/main/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.test.GreetScriptTemplate.classname similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinScripting/script-template/src/main/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.test.GreetScriptTemplate rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinScripting/script-template/src/main/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.test.GreetScriptTemplate.classname diff --git a/libraries/tools/kotlin-main-kts/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.mainKts.MainKtsScript b/libraries/tools/kotlin-main-kts/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.mainKts.MainKtsScript.classname similarity index 100% rename from libraries/tools/kotlin-main-kts/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.mainKts.MainKtsScript rename to libraries/tools/kotlin-main-kts/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.mainKts.MainKtsScript.classname diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt index 413c871f231..a28024aec15 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt @@ -23,6 +23,7 @@ import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration import kotlin.script.templates.ScriptTemplateDefinition internal const val SCRIPT_DEFINITION_MARKERS_PATH = "META-INF/kotlin/script/templates/" +internal const val SCRIPT_DEFINITION_MARKERS_EXTENSION_WITH_DOT = ".classname" class ScriptDefinitionsFromClasspathDiscoverySource( private val classpath: List, @@ -61,7 +62,7 @@ internal fun discoverScriptTemplatesInClasspath( if (jar.getJarEntry(SCRIPT_DEFINITION_MARKERS_PATH) != null) { val definitionNames = jar.entries().asSequence().mapNotNull { if (it.isDirectory || !it.name.startsWith(SCRIPT_DEFINITION_MARKERS_PATH)) null - else it.name.removePrefix(SCRIPT_DEFINITION_MARKERS_PATH) + else it.name.removePrefix(SCRIPT_DEFINITION_MARKERS_PATH).removeSuffix(SCRIPT_DEFINITION_MARKERS_EXTENSION_WITH_DOT) }.toList() val (loadedDefinitions, notFoundClasses) = definitionNames.partitionLoadJarDefinitions(jar, loader, scriptResolverEnv, messageCollector)