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

[scripting] Fix script resolver options parsing

Browse Source 
#KT-49400 Fixed
This commit is contained in:
Ilya Muradyan
2021-10-22 23:50:23 +03:00
committed by TeamCityServer
parent 8a1362de03
commit a22c8c8f2f
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/dependencies/src/kotlin/script/experimental/dependencies/impl/SimpleExternalDependenciesResolverOptionsParser.kt
+17 -3
View File
@@ -8,9 +8,23 @@ package kotlin.script.experimental.dependencies.impl
import kotlin.script.experimental.api.*
import kotlin.script.experimental.dependencies.ExternalDependenciesResolver
private val nameRegex = Regex("^[^\\S\\r\\n]*([a-zA-Z][a-zA-Z0-9-_]*)\\b")
private val valueRegex = Regex("^[^\\S\\r\\n]*([a-zA-Z0-9-_,]+)\\b")
private val nameRegex = Regex("^[^\\S\\r\\n]*([a-zA-Z][a-zA-Z0-9-_]*)[^\\S\\r\\n]?")
private val valueRegex = Regex("^[^\\S\\r\\n]*((([a-zA-Z0-9-_,/$.:])|(\\\\[\\\\ nt]))+)[^\\S\\r\\n]?")
private val equalsRegex = Regex("^[^\\S\\r\\n]*=")
private val escapeRegex = Regex("\\\\(.)")
private fun String.unescape(): String {
return replace(escapeRegex) { match ->
when (val c = match.groups[1]!!.value.single()) {
'\\' -> "\\"
' ' -> " "
'n' -> "\n"
't' -> "\t"
// Impossible situation: all possible values are mentioned in the regex
else -> error("Unknown escaped symbol: $c")
}
}
}
/**
* Simple lightweight options parser for external dependency resolvers.
@@ -42,7 +56,7 @@ object SimpleExternalDependenciesResolverOptionsParser {
}
fun takeName(): Token.Name? = take(nameRegex)?.let { Token.Name(it.groups[1]!!.value) }
fun takeValue(): Token.Value? = take(valueRegex)?.let { Token.Value(it.groups[1]!!.value) }
fun takeValue(): Token.Value? = take(valueRegex)?.let { Token.Value(it.groups[1]!!.value.unescape()) }
fun takeEquals(): Token.Equals? = take(equalsRegex)?.let { Token.Equals }
fun hasFinished(): Boolean = remaining.isBlank()