Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ object Reporter {
val problems = reporter.get.problems
println(problems.toList)
assert(problems.size == 2)
assert(problems.forall(_.position.offset.isDefined))
assert(problems.count(_.severity == Severity.Error) == 1) // not found: er1,
assert(problems.count(_.severity == Severity.Warn) == 1) // `with' as a type operator has been deprecated; use `&' instead,
})
)
}
}
19 changes: 12 additions & 7 deletions sbt-bridge/src/xsbt/DelegatingReporter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ final class DelegatingReporter(delegate: xsbti.Reporter) extends Reporter
}

val position = new Position {
def line: Maybe[Integer] = Maybe.nothing()
def lineContent: String = ""
def offset: Maybe[Integer] = Maybe.nothing()
def pointer: Maybe[Integer] = Maybe.nothing()
def pointerSpace: Maybe[String] = Maybe.nothing()
def sourceFile: Maybe[java.io.File] = Maybe.nothing()
def sourcePath: Maybe[String] = Maybe.nothing()
def line: Maybe[Integer] = Maybe.just(cont.pos.line)
def lineContent: String = cont.pos.lineContent
def offset: Maybe[Integer] = Maybe.just(cont.pos.point)
def pointer: Maybe[Integer] = Maybe.just(cont.pos.point)
def pointerSpace: Maybe[String] = Maybe.just(" " * cont.pos.point)
def sourceFile: Maybe[java.io.File] = maybe(Option(cont.pos.source.file.file))
def sourcePath: Maybe[String] = maybe(Option(cont.pos.source.file.file).map(_.getPath))
}

val sb = new StringBuilder()
Expand All @@ -45,4 +45,9 @@ final class DelegatingReporter(delegate: xsbti.Reporter) extends Reporter

delegate.log(position, sb.toString(), severity)
}

private[this] def maybe[T](opt: Option[T]): Maybe[T] = opt match {
case None => Maybe.nothing[T]
case Some(s) => Maybe.just[T](s)
}
}