Convert reporting classes

Author: odersky

compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala

@@ -20,7 +20,7 @@ class ConsoleReporter(
   def printMessage(msg: String): Unit = { writer.print(msg + "\n"); writer.flush() }
 
   /** Prints the message with the given position indication. */
-  def doReport(dia: Diagnostic)(implicit ctx: Context): Unit = {
+  def doReport(dia: Diagnostic)(using Context): Unit = {
     val didPrint = dia match {
       case dia: Error =>
         printMessage(messageAndPos(dia.msg, dia.pos, diagnosticLevel(dia)))
@@ -39,5 +39,5 @@ class ConsoleReporter(
       printMessage("\nlonger explanation available when compiling with `-explain`")
   }
 
-  override def flush()(implicit ctx: Context): Unit = { writer.flush() }
+  override def flush()(using Context): Unit = { writer.flush() }
 }

compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala

@@ -45,35 +45,35 @@ object Diagnostic:
     msg: Message,
     pos: SourcePosition
   ) extends Warning(msg, pos) {
-    def enablingOption(implicit ctx: Context): Setting[Boolean]
+    def enablingOption(using Context): Setting[Boolean]
   }
 
   class FeatureWarning(
     msg: Message,
     pos: SourcePosition
   ) extends ConditionalWarning(msg, pos) {
-    def enablingOption(implicit ctx: Context): Setting[Boolean] = ctx.settings.feature
+    def enablingOption(using Context): Setting[Boolean] = ctx.settings.feature
   }
 
   class UncheckedWarning(
     msg: Message,
     pos: SourcePosition
   ) extends ConditionalWarning(msg, pos) {
-    def enablingOption(implicit ctx: Context): Setting[Boolean] = ctx.settings.unchecked
+    def enablingOption(using Context): Setting[Boolean] = ctx.settings.unchecked
   }
 
   class DeprecationWarning(
     msg: Message,
     pos: SourcePosition
   ) extends ConditionalWarning(msg, pos) {
-    def enablingOption(implicit ctx: Context): Setting[Boolean] = ctx.settings.deprecation
+    def enablingOption(using Context): Setting[Boolean] = ctx.settings.deprecation
   }
 
   class MigrationWarning(
     msg: Message,
     pos: SourcePosition
   ) extends Warning(msg, pos) {
-    def enablingOption(implicit ctx: Context): Setting[Boolean] = ctx.settings.migration
+    def enablingOption(using Context): Setting[Boolean] = ctx.settings.migration
   }
 
 class Diagnostic(

compiler/src/dotty/tools/dotc/reporting/HideNonSensicalMessages.scala

@@ -11,7 +11,7 @@ trait HideNonSensicalMessages extends Reporter {
   /** Hides non-sensical messages, unless we haven't reported any error yet or
    *  `-Yshow-suppressed-errors` is set.
    */
-  override def isHidden(dia: Diagnostic)(implicit ctx: Context): Boolean =
+  override def isHidden(dia: Diagnostic)(using Context): Boolean =
     super.isHidden(dia) || {
         dia.msg.isNonSensical &&
         hasErrors && // if there are no errors yet, report even if diagnostic is non-sensical

compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala

@@ -30,7 +30,7 @@ trait MessageRendering {
     *
     * @return a list of strings with inline locations
     */
-  def outer(pos: SourcePosition, prefix: String)(implicit ctx: Context): List[String] =
+  def outer(pos: SourcePosition, prefix: String)(using Context): List[String] =
     if (pos.outer.exists)
        i"$prefix| This location contains code that was inlined from $pos" ::
        outer(pos.outer, prefix)
@@ -41,7 +41,7 @@ trait MessageRendering {
     *
     * @return (lines before error, lines after error, line numbers offset)
     */
-  def sourceLines(pos: SourcePosition, diagnosticLevel: String)(implicit ctx: Context): (List[String], List[String], Int) = {
+  def sourceLines(pos: SourcePosition, diagnosticLevel: String)(using Context): (List[String], List[String], Int) = {
     assert(pos.exists && pos.source.file.exists)
     var maxLen = Int.MinValue
     def render(offsetAndLine: (Int, String)): String = {
@@ -78,7 +78,7 @@ trait MessageRendering {
   }
 
   /** The column markers aligned under the error */
-  def columnMarker(pos: SourcePosition, offset: Int, diagnosticLevel: String)(implicit ctx: Context): String = {
+  def columnMarker(pos: SourcePosition, offset: Int, diagnosticLevel: String)(using Context): String = {
     val prefix = " " * (offset - 1)
     val padding = pos.startColumnPadding
     val carets = hl(diagnosticLevel) {
@@ -93,7 +93,7 @@ trait MessageRendering {
     *
     * @return aligned error message
     */
-  def errorMsg(pos: SourcePosition, msg: String, offset: Int)(implicit ctx: Context): String = {
+  def errorMsg(pos: SourcePosition, msg: String, offset: Int)(using Context): String = {
     val padding = msg.linesIterator.foldLeft(pos.startColumnPadding) { (pad, line) =>
       val lineLength = stripColor(line).length
       val maxPad = math.max(0, ctx.settings.pageWidth.value - offset - lineLength) - offset
@@ -111,7 +111,7 @@ trait MessageRendering {
     *
     * @return separator containing error location and kind
     */
-  def posStr(pos: SourcePosition, diagnosticLevel: String, message: Message)(implicit ctx: Context): String =
+  def posStr(pos: SourcePosition, diagnosticLevel: String, message: Message)(using Context): String =
     if (pos.exists) hl(diagnosticLevel)({
       val pos1 = pos.nonInlined
       val file =
@@ -131,7 +131,7 @@ trait MessageRendering {
     }) else ""
 
   /** Explanation rendered under "Explanation" header */
-  def explanation(m: Message)(implicit ctx: Context): String = {
+  def explanation(m: Message)(using Context): String = {
     val sb = new StringBuilder(
       s"""|
           |${Blue("Explanation").show}
@@ -143,7 +143,7 @@ trait MessageRendering {
   }
 
   /** The whole message rendered from `msg` */
-  def messageAndPos(msg: Message, pos: SourcePosition, diagnosticLevel: String)(implicit ctx: Context): String = {
+  def messageAndPos(msg: Message, pos: SourcePosition, diagnosticLevel: String)(using Context): String = {
     val sb = mutable.StringBuilder()
     val posString = posStr(pos, diagnosticLevel, msg)
     if (posString.nonEmpty) sb.append(posString).append(EOL)
@@ -158,7 +158,7 @@ trait MessageRendering {
     sb.toString
   }
 
-  def hl(diagnosticLevel: String)(str: String)(implicit ctx: Context): String = diagnosticLevel match {
+  def hl(diagnosticLevel: String)(str: String)(using Context): String = diagnosticLevel match {
     case "Info" => Blue(str).show
     case "Error" => Red(str).show
     case _ =>

compiler/src/dotty/tools/dotc/reporting/Reporter.scala

@@ -26,7 +26,7 @@ object Reporter {
   /** Convert a SimpleReporter into a real Reporter */
   def fromSimpleReporter(simple: interfaces.SimpleReporter): Reporter =
     new Reporter with UniqueMessagePositions with HideNonSensicalMessages {
-      override def doReport(dia: Diagnostic)(implicit ctx: Context): Unit = dia match {
+      override def doReport(dia: Diagnostic)(using Context): Unit = dia match {
         case dia: ConditionalWarning if !dia.enablingOption.value =>
         case _ =>
           simple.report(dia)
@@ -35,14 +35,14 @@ object Reporter {
 
   /** A reporter that ignores reports, and doesn't record errors */
   @sharable object NoReporter extends Reporter {
-    def doReport(dia: Diagnostic)(implicit ctx: Context): Unit = ()
-    override def report(dia: Diagnostic)(implicit ctx: Context): Unit = ()
+    def doReport(dia: Diagnostic)(using Context): Unit = ()
+    override def report(dia: Diagnostic)(using Context): Unit = ()
   }
 
   type ErrorHandler = (Diagnostic, Context) => Unit
 
   private val defaultIncompleteHandler: ErrorHandler =
-    (mc, ctx) => ctx.reporter.report(mc)(ctx)
+    (mc, ctx) => ctx.reporter.report(mc)(using ctx)
 
   /** Show prompt if `-Xprompt` is passed as a flag to the compiler */
   def displayPrompt(reader: BufferedReader, writer: PrintWriter): Unit = {
@@ -145,8 +145,8 @@ trait Reporting { thisCtx: Context =>
   def restrictionError(msg: Message, pos: SourcePosition = NoSourcePosition): Unit =
     error(msg.mapMsg("Implementation restriction: " + _), pos)
 
-  def incompleteInputError(msg: Message, pos: SourcePosition = NoSourcePosition)(implicit ctx: Context): Unit =
-    reporter.incomplete(new Error(msg, pos))(ctx)
+  def incompleteInputError(msg: Message, pos: SourcePosition = NoSourcePosition)(using Context): Unit =
+    reporter.incomplete(new Error(msg, pos))(using ctx)
 
   /** Log msg if settings.log contains the current phase.
    *  See [[config.CompilerCommand#explainAdvanced]] for the exact meaning of
@@ -175,7 +175,7 @@ trait Reporting { thisCtx: Context =>
   def debugwarn(msg: => String, pos: SourcePosition = NoSourcePosition): Unit =
     if (thisCtx.settings.Ydebug.value) warning(msg, pos)
 
-  private def addInlineds(pos: SourcePosition)(implicit ctx: Context) = {
+  private def addInlineds(pos: SourcePosition)(using Context) = {
     def recur(pos: SourcePosition, inlineds: List[Trees.Tree[?]]): SourcePosition = inlineds match {
       case inlined :: inlineds1 => pos.withOuter(recur(inlined.sourcePos, inlineds1))
       case Nil => pos
@@ -192,7 +192,7 @@ abstract class Reporter extends interfaces.ReporterResult {
   import Reporter._
 
   /** Report a diagnostic */
-  def doReport(dia: Diagnostic)(implicit ctx: Context): Unit
+  def doReport(dia: Diagnostic)(using Context): Unit
 
   /** Whether very long lines can be truncated.  This exists so important
    *  debugging information (like printing the classpath) is not rendered
@@ -261,9 +261,9 @@ abstract class Reporter extends interfaces.ReporterResult {
 
   var unreportedWarnings: Map[String, Int] = Map.empty
 
-  def report(dia: Diagnostic)(implicit ctx: Context): Unit =
+  def report(dia: Diagnostic)(using Context): Unit =
     if (!isHidden(dia)) {
-      doReport(dia)(ctx.addMode(Mode.Printing))
+      doReport(dia)(using ctx.addMode(Mode.Printing))
       dia match {
         case dia: ConditionalWarning if !dia.enablingOption.value =>
           val key = dia.enablingOption.name
@@ -278,7 +278,7 @@ abstract class Reporter extends interfaces.ReporterResult {
       }
     }
 
-  def incomplete(dia: Diagnostic)(implicit ctx: Context): Unit =
+  def incomplete(dia: Diagnostic)(using Context): Unit =
     incompleteHandler(dia, ctx)
 
   /** Summary of warnings and errors */
@@ -294,7 +294,7 @@ abstract class Reporter extends interfaces.ReporterResult {
   }
 
   /** Print the summary of warnings and errors */
-  def printSummary(implicit ctx: Context): Unit = {
+  def printSummary(using Context): Unit = {
     val s = summary
     if (s != "") ctx.echo(s)
   }
@@ -307,7 +307,7 @@ abstract class Reporter extends interfaces.ReporterResult {
   }
 
   /** Should this diagnostic not be reported at all? */
-  def isHidden(dia: Diagnostic)(implicit ctx: Context): Boolean =
+  def isHidden(dia: Diagnostic)(using Context): Boolean =
     ctx.mode.is(Mode.Printing)
 
   /** Does this reporter contain errors that have yet to be reported by its outer reporter ?
@@ -316,10 +316,10 @@ abstract class Reporter extends interfaces.ReporterResult {
   def hasUnreportedErrors: Boolean = false
 
   /** If this reporter buffers messages, remove and return all buffered messages. */
-  def removeBufferedMessages(implicit ctx: Context): List[Diagnostic] = Nil
+  def removeBufferedMessages(using Context): List[Diagnostic] = Nil
 
   /** Issue all error messages in this reporter to next outer one, or make sure they are written. */
-  def flush()(implicit ctx: Context): Unit =
+  def flush()(using Context): Unit =
     removeBufferedMessages.foreach(ctx.reporter.report)
 
   /** If this reporter buffers messages, all buffered messages, otherwise Nil */

compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala

@@ -21,7 +21,7 @@ class StoreReporter(outer: Reporter) extends Reporter {
 
   protected var infos: mutable.ListBuffer[Diagnostic] = null
 
-  def doReport(dia: Diagnostic)(implicit ctx: Context): Unit = {
+  def doReport(dia: Diagnostic)(using Context): Unit = {
     typr.println(s">>>> StoredError: ${dia.message}") // !!! DEBUG
     if (infos == null) infos = new mutable.ListBuffer
     infos += dia
@@ -33,7 +33,7 @@ class StoreReporter(outer: Reporter) extends Reporter {
   override def hasStickyErrors: Boolean =
     infos != null && infos.exists(_.isInstanceOf[StickyError])
 
-  override def removeBufferedMessages(implicit ctx: Context): List[Diagnostic] =
+  override def removeBufferedMessages(using Context): List[Diagnostic] =
     if (infos != null) try infos.toList finally infos = null
     else Nil
 

compiler/src/dotty/tools/dotc/reporting/ThrowingReporter.scala

@@ -10,7 +10,7 @@ import Diagnostic.Error
  * info to the underlying reporter.
  */
 class ThrowingReporter(reportInfo: Reporter) extends Reporter {
-  def doReport(dia: Diagnostic)(implicit ctx: Context): Unit = dia match {
+  def doReport(dia: Diagnostic)(using Context): Unit = dia match {
     case _: Error => throw dia
     case _ => reportInfo.doReport(dia)
   }

compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala

@@ -15,7 +15,7 @@ trait UniqueMessagePositions extends Reporter {
   /** Logs a position and returns true if it was already logged.
    *  @note  Two positions are considered identical for logging if they have the same point.
    */
-  override def isHidden(dia: Diagnostic)(implicit ctx: Context): Boolean =
+  override def isHidden(dia: Diagnostic)(using Context): Boolean =
     super.isHidden(dia) || {
       dia.pos.exists && !ctx.settings.YshowSuppressedErrors.value && {
         var shouldHide = false