Tweak things to fit into Java reporting API

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)(using Context, CState): Unit = {
+  def doReport(dia: Diagnostic)(using Context): Unit = {
     val didPrint = dia match {
       case dia: Error =>
         printMessage(messageAndPos(dia.msg, dia.pos, diagnosticLevel(dia)))

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

@@ -11,7 +11,7 @@ import java.util.Optional
 
 object Diagnostic:
 
-  def shouldExplain(dia: Diagnostic)(using Context, CState): Boolean =
+  def shouldExplain(dia: Diagnostic)(using Context): Boolean =
     dia.msg.explanation.nonEmpty && ctx.settings.explain.value
 
   // `Diagnostics to be consumed by `Reporter` ---------------------- //
@@ -45,35 +45,35 @@ object Diagnostic:
     msg: Message,
     pos: SourcePosition
   ) extends Warning(msg, pos) {
-    def enablingOption(using Context, CState): Setting[Boolean]
+    def enablingOption(using Context): Setting[Boolean]
   }
 
   class FeatureWarning(
     msg: Message,
     pos: SourcePosition
   ) extends ConditionalWarning(msg, pos) {
-    def enablingOption(using Context, CState): 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(using Context, CState): 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(using Context, CState): 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(using Context, CState): Setting[Boolean] = ctx.settings.migration
+    def enablingOption(using Context): Setting[Boolean] = ctx.settings.migration
   }
 
 class Diagnostic(

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

@@ -93,7 +93,7 @@ trait MessageRendering {
     *
     * @return aligned error message
     */
-  def errorMsg(pos: SourcePosition, msg: String, offset: Int)(using Context, CState): 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
@@ -131,7 +131,8 @@ trait MessageRendering {
     }) else ""
 
   /** Explanation rendered under "Explanation" header */
-  def explanation(m: Message)(using Context, CState): String = {
+  def explanation(m: Message)(using Context): String = {
+    given CState = ctx.cstate
     val sb = new StringBuilder(
       s"""|
           |${Blue("Explanation").show}
@@ -143,7 +144,8 @@ trait MessageRendering {
   }
 
   /** The whole message rendered from `msg` */
-  def messageAndPos(msg: Message, pos: SourcePosition, diagnosticLevel: String)(using Context, CState): String = {
+  def messageAndPos(msg: Message, pos: SourcePosition, diagnosticLevel: String)(using Context): String = {
+    given CState = ctx.cstate
     val sb = mutable.StringBuilder()
     val posString = posStr(pos, diagnosticLevel, msg)
     if (posString.nonEmpty) sb.append(posString).append(EOL)

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

@@ -22,7 +22,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)(using Context, CState): Unit = dia match {
+      override def doReport(dia: Diagnostic)(using Context): Unit = dia match {
         case dia: ConditionalWarning if !dia.enablingOption.value =>
         case _ =>
           simple.report(dia)
@@ -31,7 +31,7 @@ object Reporter {
 
   /** A reporter that ignores reports, and doesn't record errors */
   @sharable object NoReporter extends Reporter {
-    def doReport(dia: Diagnostic)(using Context, CState): Unit = ()
+    def doReport(dia: Diagnostic)(using Context): Unit = ()
     override def report(dia: Diagnostic)(using Context, CState): Unit = ()
   }
 
@@ -72,7 +72,7 @@ abstract class Reporter extends interfaces.ReporterResult {
   import Reporter._
 
   /** Report a diagnostic */
-  def doReport(dia: Diagnostic)(using Context, CState): 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
@@ -174,7 +174,8 @@ abstract class Reporter extends interfaces.ReporterResult {
   }
 
   /** Print the summary of warnings and errors */
-  def printSummary(using Context, CState): Unit = {
+  def printSummary(using Context): Unit = {
+    given CState = ctx.cstate
     val s = summary
     if (s != "") report(new Info(s, NoSourcePosition))
   }

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)(using Context, CState): Unit = {
+  def doReport(dia: Diagnostic)(using Context): Unit = {
     typr.println(s">>>> StoredError: ${dia.message}") // !!! DEBUG
     if (infos == null) infos = new mutable.ListBuffer
     infos += dia

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)(using Context, CState): Unit = dia match {
+  def doReport(dia: Diagnostic)(using Context): Unit = dia match {
     case _: Error => throw dia
     case _ => reportInfo.doReport(dia)
   }

compiler/src/dotty/tools/repl/Rendering.scala

@@ -97,7 +97,7 @@ private[repl] class Rendering(parentClassLoader: Option[ClassLoader] = None) {
   /** Formats errors using the `messageRenderer` */
   def formatError(dia: Diagnostic)(implicit state: State): Diagnostic =
     new Diagnostic(
-      messageRenderer.messageAndPos(dia.msg, dia.pos, messageRenderer.diagnosticLevel(dia))(using state.context, state.context.cstate),
+      messageRenderer.messageAndPos(dia.msg, dia.pos, messageRenderer.diagnosticLevel(dia))(using state.context),
       dia.pos,
       dia.level
     )