kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[orx-olive] Add support for working with .kt files that have a filename starting with a digit

Browse Source
This commit is contained in:
Edwin Jakobs
2022-01-10 21:49:35 +01:00
parent a039e6e42b
commit ebe3c2b395
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
orx-jvm/orx-olive/src/main/kotlin/OliveProgram.kt
View File

@@ -37,13 +37,15 @@ fun ApplicationBuilder.oliveProgram(scriptHost: OliveScriptHost = OliveScriptHos
var sourceLocation = "src/main/kotlin/$rootClassName.kt" var sourceLocation = "src/main/kotlin/$rootClassName.kt"
val candidateFile = File(sourceLocation) val candidateFile = File(sourceLocation)
val rootClassNameCleaned = if (rootClassName.startsWith("_")) rootClassName.drop(1) else rootClassName
if (!candidateFile.exists()) { if (!candidateFile.exists()) {
val otherCandidates = Files.walk(Paths.get(".")) val otherCandidates = Files.walk(Paths.get("."))
.filter { Files.isRegularFile(it) && it.toString().endsWith("$rootClassName.kt") }.toList() .filter { Files.isRegularFile(it) && it.toString().endsWith("$rootClassNameCleaned.kt") }.toList()
if (otherCandidates.size == 1) { if (otherCandidates.size == 1) {
sourceLocation = otherCandidates.first().toString() sourceLocation = otherCandidates.first().toString()
} else { } else {
error("multiple source candidates found: $otherCandidates") error("multiple source candidates found for $rootClassName: $otherCandidates")
} }
} }
program = object : OliveProgram(sourceLocation, scriptHost, resources) { program = object : OliveProgram(sourceLocation, scriptHost, resources) {