Change import hoisting to only hoist imports in Kotlin blocks

Prevents imports in plain text (e.g. a code sample) from unintentionally being hoisted)
This commit is contained in:
Shadowfacts 2017-10-29 19:26:09 -04:00
parent b1ed9241ef
commit c52b10bea3
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
3 changed files with 20 additions and 11 deletions

View File

@ -52,6 +52,13 @@ _result.toString()
@Suppress("NAME_SHADOWING") @Suppress("NAME_SHADOWING")
var template = template var template = template
val lines = template.split("\n")
val isImport: (String) -> Boolean = {
val trimmed = it.trim()
trimmed.startsWith("[: import") || trimmed.startsWith("[:import")
}
val imports = lines.filter(isImport).joinToString("\n") { it.substring(2, it.length - 2) }
template = lines.filterNot(isImport).joinToString("\n")
template = template.replace("$", "\${'$'}") template = template.replace("$", "\${'$'}")
template = ":]$template[:" template = ":]$template[:"
template = template.replace(startStringRegex, { template = template.replace(startStringRegex, {
@ -71,10 +78,6 @@ _result.toString()
} }
}) })
val lines = template.split("\n")
val imports = lines.filter { it.trim().startsWith("import") }.joinToString("\n")
template = lines.filterNot { it.trim().startsWith("import") }.joinToString("\n")
val script = imports + scriptPrefix + template + scriptSuffix val script = imports + scriptPrefix + template + scriptSuffix
if (env.cacheDir != null) { if (env.cacheDir != null) {

View File

@ -8,14 +8,16 @@ import kotlin.concurrent.thread
* @author shadowfacts * @author shadowfacts
*/ */
fun main(args: Array<String>) { fun main(args: Array<String>) {
println(ManagementFactory.getRuntimeMXBean().name) File("output.txt").writeText(render())
for (i in 0..99) { // println(ManagementFactory.getRuntimeMXBean().name)
println("Rendering $i") //
render() // for (i in 0..99) {
} // println("Rendering $i")
// render()
println("done") // }
//
// println("done")
// thread { // thread {
// for (i in 0..30) { // for (i in 0..30) {

View File

@ -8,6 +8,10 @@ Environment type: [= _env::class.simpleName =]
Sum: [= list.sum() =] Sum: [= list.sum() =]
<pre>
import a.b.c;
</pre>
[: [:
include("include") { include("include") {
"foo" to "bar" "foo" to "bar"