luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extract method - for new implementation. Not completed yet.

This commit is contained in:
andrzej.jozwik@gmail.com 2014-09-12 23:35:07 +02:00 committed by Eugene Yokota
parent eab7049479
commit 4a33fd2225
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main/src/main/scala/sbt/SessionSettings.scala
View File

@ -113,15 +113,8 @@ object SessionSettings {
}
}
val newSettings = settings diff replace
val (tmpLines, _) = ((List[String](), 1) /: IO.readLines(writeTo).zipWithIndex) {
case ((accLines, n), (line, m)) if n == m + 1 =>
lineMap.get(n) match {
case Some(Pair(end, lines)) => (lines reverse_::: accLines, end)
case None => (line :: accLines, n + 1)
}
case (res, _) => res
}
val exist = tmpLines.reverse
val oldContentWithIndex = IO.readLines(writeTo).zipWithIndex
val exist: List[String] = toLines(oldContentWithIndex, lineMap)
val adjusted = if (!newSettings.isEmpty && needsTrailingBlank(exist)) exist :+ "" else exist
val lines = adjusted ++ newSettings.flatMap(_._2 ::: "" :: Nil)
IO.writeLines(writeTo, lines)
@ -132,6 +125,19 @@ object SessionSettings {
}
(newWithPos.reverse, other ++ oldShifted)
}
private[sbt] def toLines(oldContentWithIndex: List[(String,Int)], lineMap: Map[Int, (Int, List[String])]): List[String] = {
val (tmpLines, _) = ((List[String](), 1) /: oldContentWithIndex) {
case ((accLines, n), (line, m)) if n == m + 1 =>
lineMap.get(n) match {
case Some(Pair(end, lines)) => (lines reverse_::: accLines, end)
case None => (line :: accLines, n + 1)
}
case (res, _) => res
}
tmpLines.reverse
}
def needsTrailingBlank(lines: Seq[String]) = !lines.isEmpty && !lines.takeRight(1).exists(_.trim.isEmpty)
def printAllSettings(s: State): State =
withSettings(s) { session =>