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

allow cycles in graphs even when printing with AsciiTreeLayout, fixes #77

This commit is contained in:
Johannes Rudolph 2015-11-17 17:29:58 +01:00
parent 5f3c2c2659
commit 0c3cf98a89
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/scala/net/virtualvoid/sbt/graph/util/AsciiTreeLayout.scala
View File

@ -28,20 +28,27 @@ object AsciiTreeLayout {
}) +
s.slice(at + 1, s.length)
else s
def toAsciiLines(node: A, level: Int): Vector[String] = {
val line = limitLine((twoSpaces * level) + (if (level == 0) "" else "+-") + display(node))
val cs = Vector(children(node): _*)
val childLines = cs map {toAsciiLines(_, level + 1)}
val withBar = childLines.zipWithIndex flatMap {
case (lines, pos) if pos < (cs.size - 1) => lines map {insertBar(_, 2 * (level + 1))}
case (lines, pos) =>
if (lines.last.trim != "") lines ++ Vector(twoSpaces * (level + 1))
else lines
def toAsciiLines(node: A, level: Int, parents: Set[A]): Vector[String] =
if (parents contains node) // cycle
Vector(limitLine((twoSpaces * level) + "#-" + display(node)))
else {
val line = limitLine((twoSpaces * level) + (if (level == 0) "" else "+-") + display(node))
val cs = Vector(children(node): _*)
val childLines = cs map {
toAsciiLines(_, level + 1, parents + node)
}
val withBar = childLines.zipWithIndex flatMap {
case (lines, pos) if pos < (cs.size - 1) => lines map {
insertBar(_, 2 * (level + 1))
}
case (lines, pos) =>
if (lines.last.trim != "") lines ++ Vector(twoSpaces * (level + 1))
else lines
}
line +: withBar
}
line +: withBar
}
toAsciiLines(top, 0).mkString("\n")
toAsciiLines(top, 0, Set.empty).mkString("\n")
}
def defaultColumnSize: Int = {

13
src/test/scala/net/virtualvoid/sbt/graph/util/AsciiTreeLayoutSpecs.scala
View File

@ -77,15 +77,18 @@ class AsciiTreeLayoutSpecs extends Specification {
| +-2
| | +-4
| | | +-3
| | |
| | |\u0020
| | +-5
| | #-1
| | #-4
| | +-4
| | | +-3
| | |\u0020
| | +-6
| | +-7
| |
| #-3
| #-4""".stripMargin.trim
| |\u0020\u0020\u0020
| +-3
| +-4
| +-3""".stripMargin.trim
}
}
}