2 files changed, 31 insertions, 2 deletions
diff --git a/doc-tool/src/dotty/tools/dottydoc/core/ContextDottydoc.scala b/doc-tool/src/dotty/tools/dottydoc/core/ContextDottydoc.scala
index c60038836..16f0776fa 100644
--- a/doc-tool/src/dotty/tools/dottydoc/core/ContextDottydoc.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/core/ContextDottydoc.scala
@@ -6,6 +6,10 @@ import dotc.core.Symbols.Symbol
 import dotc.core.Comments.ContextDocstrings
 import model.Package
 
+import dotc.core.Contexts.Context
+import dotc.printing.Highlighting._
+import dotc.util.{ SourcePosition, NoSourcePosition }
+
 class ContextDottydoc extends ContextDocstrings {
   import scala.collection.mutable
 
@@ -20,4 +24,29 @@ class ContextDottydoc extends ContextDocstrings {
   def addDef(s: Symbol, d: Symbol): Unit = _defs = (_defs + {
     s -> _defs.get(s).map(xs => xs + d).getOrElse(Set(d))
   })
+
+  def error(msg: String, pos: SourcePosition)(implicit ctx: Context): Unit = ctx.error({
+    NoColor("[") + Red("doc error") + "] " + msg
+  }.toString, pos)
+
+  def error(msg: String)(implicit ctx: Context): Unit = error(msg, NoSourcePosition)
+
+  def warn(msg: String, pos: SourcePosition)(implicit ctx: Context): Unit = ctx.warning({
+    NoColor("[") + Yellow("doc warn") + "] " + msg
+  }.toString, pos)
+
+  def warn(msg: String)(implicit ctx: Context): Unit = warn(msg, NoSourcePosition)
+
+  def echo(msg: String, pos: SourcePosition)(implicit ctx: Context): Unit = ctx.echo({
+    "[doc info] " + msg
+  }.toString, pos)
+
+  def echo(msg: String)(implicit ctx: Context): Unit = echo(msg, NoSourcePosition)
+
+  def debug(msg: String, pos: SourcePosition)(implicit ctx: Context): Unit =
+    if (ctx.settings.debug.value) ctx.inform({
+      "[doc debug] " + msg
+    }.toString, pos)
+
+  def debug(msg: String)(implicit ctx: Context): Unit = debug(msg, NoSourcePosition)
 }
diff --git a/doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala b/doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala
index 36b9db93c..460566838 100644
--- a/doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala
@@ -124,7 +124,7 @@ class DocASTPhase extends Phase {
         ValImpl(v.symbol, annotations(v.symbol), v.name.decode.toString, flags(v), path(v.symbol), returnType(v.tpt.tpe), kind)
 
       case x => {
-        //dottydoc.println(s"Found unwanted entity: $x (${x.pos},\n${x.show}")
+        ctx.docbase.debug(s"Found unwanted entity: $x (${x.pos},\n${x.show}")
         NonEntity
       }
     }
@@ -226,7 +226,7 @@ class DocASTPhase extends Phase {
 
   override def run(implicit ctx: Context): Unit = {
     currentRun += 1
-    println(s"Compiling ($currentRun/$totalRuns): ${ctx.compilationUnit.source.file.name}")
+    ctx.docbase.echo(s"Compiling ($currentRun/$totalRuns): ${ctx.compilationUnit.source.file.name}")
     collect(ctx.compilationUnit.tpdTree) // Will put packages in `packages` var
   }