Merge remote-tracking branch 'scalatest/new-framework-api-12' into 0.13

util/collection/src/main/scala/sbt/Positions.scala

@@ -1,20 +1,20 @@
-package sbt
+package sbt
-
+
-sealed trait SourcePosition
+sealed trait SourcePosition
-
+
-sealed trait FilePosition extends SourcePosition {
+sealed trait FilePosition extends SourcePosition {
-	def path: String
+	def path: String
-	def startLine: Int
+	def startLine: Int
-}
+}
-
+
-case object NoPosition extends SourcePosition
+case object NoPosition extends SourcePosition
-
+
-final case class LinePosition(path: String, startLine: Int) extends FilePosition
+final case class LinePosition(path: String, startLine: Int) extends FilePosition
-
+
-final case class LineRange(start: Int, end: Int) {
+final case class LineRange(start: Int, end: Int) {
-	def shift(n: Int) = new LineRange(start + n, end + n)
+	def shift(n: Int) = new LineRange(start + n, end + n)
-}
+}
-
+
-final case class RangePosition(path: String, range: LineRange) extends FilePosition {
+final case class RangePosition(path: String, range: LineRange) extends FilePosition {
-	def startLine = range.start
+	def startLine = range.start
-}
+}