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

[Gradle, JS] Extract methods about parse line

Browse Source 
#KT-38990 fixed
This commit is contained in:
Ilya Goncharov
2020-05-12 14:39:32 +03:00
parent 0492d81a8c
commit fd7cd7167c
1 changed files with 59 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnLock.kt
+59 -37
View File
@@ -61,44 +61,10 @@ data class YarnLock(val entries: List<Entry>) {
val indentPos = i val indentPos = i
val indent = line.substring(0, indentPos) val indent = line.substring(0, indentPos)
var key = false val key = line.endsWith(":")
val line1: String = if (line.endsWith(":")) {
key = true
line.removeSuffix(":")
} else line
if (line1.isNotEmpty()) { if (line.isNotEmpty()) {
var line2: String = line1 val values = parseLine(line, indentPos)
val quotedValues = QUOTED_VALUE.findAll(line1)
.flatMap { it.groupValues.drop(1).asSequence() }
.toList()
.apply {
forEachIndexed { index, item ->
line2 = line2.replace(
"""
"$item"
""".trimIndent(),
"""
"$$index"
""".trimIndent()
)
}
}
val values = line2.substring(indentPos).split(" ").map { value ->
val value1 = value.removeSuffix(",")
if (value1.startsWith("\"")) {
val (index) = QUOTED_PLACEHOLDER.find(value1)!!.destructured
val value2 = """
"${quotedValues[index.toInt()]}"
""".trimIndent()
try {
JsonReader(StringReader(value2)).nextString()
} catch (e: Throwable) {
value2.removePrefix("\"").removeSuffix("\"")
}
} else value1
}
if (onNewLevel) { if (onNewLevel) {
parent.indent = indent parent.indent = indent
@@ -125,8 +91,64 @@ data class YarnLock(val entries: List<Entry>) {
} }
return root return root
} }
private fun parseLine(line: String, indentPos: Int): List<String> {
val quotedLineResult = replaceQuoted(line.removeSuffix(":"))
return quotedLineResult
.parse(indentPos)
}
private fun replaceQuoted(line: String): QuotedLineResult {
var result: String = line
val quotedValues = QUOTED_VALUE.findAll(line)
.flatMap { it.groupValues.drop(1).asSequence() }
.toList()
quotedValues.forEachIndexed { index, item ->
result = result.replace(
"""
"$item"
""".trimIndent(),
"""
"$$index"
""".trimIndent()
)
}
return QuotedLineResult(
result,
quotedValues
)
}
} }
} }
private data class QuotedLineResult(
val value: String,
val quotedValues: List<String>
)
private fun QuotedLineResult.parse(indentPos: Int): List<String> {
return value
.substring(indentPos)
.split(" ")
.map { value ->
val withoutComma = value.removeSuffix(",")
if (withoutComma.startsWith("\"")) {
val (index) = QUOTED_PLACEHOLDER.find(withoutComma)!!.destructured
val restoredValue = """
"${quotedValues[index.toInt()]}"
""".trimIndent()
try {
JsonReader(StringReader(restoredValue)).nextString()
} catch (e: Throwable) {
restoredValue.removePrefix("\"").removeSuffix("\"")
}
} else withoutComma
}
}
private val QUOTED_VALUE = """"(.+?)"""".toRegex() private val QUOTED_VALUE = """"(.+?)"""".toRegex()
private val QUOTED_PLACEHOLDER = """\$(\d+)""".toRegex() private val QUOTED_PLACEHOLDER = """\$(\d+)""".toRegex()