erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 00:17:11 -07:00
Code Releases Activity

Don’t run buildScript{} twice.

Browse source
This commit is contained in:
Cedric Beust 2017-03-07 13:53:45 -08:00
parent e297586e62
commit bdd80bdedd
2 changed files with 31 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/BlockExtractor.kt
View file

@ -11,12 +11,19 @@ fun main(argv: Array<String>) {
// BlockExtractor("plugins", '(', ')').extractBlock(lines)
}
class BuildScriptInfo(val content: String, val startLine: Int, val endLine: Int)
/**
* Used to extract a keyword followed by opening and closing tags out of a list of strings,
* e.g. buildScript { ... }.
*/
class BlockExtractor(val regexp: Pattern, val opening: Char, val closing: Char) {
fun extractBlock(lines: List<String>): String? {
fun extractBlock(lines: List<String>): BuildScriptInfo? {
var currentLineNumber = 0
// First line of the buildScript block
var startLine = 0
// Last line of the buildScript block
var endLine = 0
var foundKeyword = false
var foundClosing = false
var count = 0
@ -34,6 +41,7 @@ class BlockExtractor(val regexp: Pattern, val opening: Char, val closing: Char)
if (count == 0) {
currentLine.append(closing).append("\n")
foundClosing = true
endLine = currentLineNumber
}
}
if (foundKeyword && count > 0) currentLine.append(c)
@ -43,8 +51,10 @@ class BlockExtractor(val regexp: Pattern, val opening: Char, val closing: Char)
}
lines.forEach { line ->
currentLineNumber++
val found = regexp.matcher(line).matches()
if (found) {
startLine = currentLineNumber
foundKeyword = true
count = 1
result.append(topLines.joinToString("\n"))
@ -55,12 +65,12 @@ class BlockExtractor(val regexp: Pattern, val opening: Char, val closing: Char)
}
if (foundKeyword && foundClosing && count == 0) {
return result.toString()
return BuildScriptInfo(result.toString(), startLine, endLine)
}
}
if (foundKeyword && foundClosing && count == 0) {
return result.toString()
return BuildScriptInfo(result.toString(), startLine, endLine)
} else {
return null
}