azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add optional suffix to the script template markers

Browse Source 
add suffix to the markers in the repo
#KT-28593 fixed
This commit is contained in:
Ilya Chernikov
2019-03-15 16:14:17 +01:00
parent 79fcaae991
commit fc9a6dec7e
3 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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 → 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
View File
libraries/tools/kotlin-main-kts/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.mainKts.MainKtsScript → libraries/tools/kotlin-main-kts/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.mainKts.MainKtsScript.classname
View File
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt
+2 -1
View File
@@ -23,6 +23,7 @@ import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
import kotlin.script.templates.ScriptTemplateDefinition import kotlin.script.templates.ScriptTemplateDefinition
internal const val SCRIPT_DEFINITION_MARKERS_PATH = "META-INF/kotlin/script/templates/" internal const val SCRIPT_DEFINITION_MARKERS_PATH = "META-INF/kotlin/script/templates/"
internal const val SCRIPT_DEFINITION_MARKERS_EXTENSION_WITH_DOT = ".classname"
class ScriptDefinitionsFromClasspathDiscoverySource( class ScriptDefinitionsFromClasspathDiscoverySource(
private val classpath: List<File>, private val classpath: List<File>,
@@ -61,7 +62,7 @@ internal fun discoverScriptTemplatesInClasspath(
if (jar.getJarEntry(SCRIPT_DEFINITION_MARKERS_PATH) != null) { if (jar.getJarEntry(SCRIPT_DEFINITION_MARKERS_PATH) != null) {
val definitionNames = jar.entries().asSequence().mapNotNull { val definitionNames = jar.entries().asSequence().mapNotNull {
if (it.isDirectory || !it.name.startsWith(SCRIPT_DEFINITION_MARKERS_PATH)) null 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() }.toList()
val (loadedDefinitions, notFoundClasses) = val (loadedDefinitions, notFoundClasses) =
definitionNames.partitionLoadJarDefinitions(jar, loader, scriptResolverEnv, messageCollector) definitionNames.partitionLoadJarDefinitions(jar, loader, scriptResolverEnv, messageCollector)