Reporter fix. Message levels

Author: pikinier20

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

@@ -37,7 +37,7 @@ class StoreReporter(outer: Reporter = Reporter.NoReporter) extends Reporter {
     if (infos != null) try infos.toList finally infos = null
     else Nil
 
-  override def pendingMessages(using Context): List[Diagnostic] = infos.toList
+  override def pendingMessages(using Context): List[Diagnostic] = if (infos != null) infos.toList else Nil
 
   override def errorsReported: Boolean = hasErrors || (outer != null && outer.errorsReported)
 }

scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilationResult.scala

@@ -3,7 +3,14 @@ package snippets
 
 import dotty.tools.io.{ AbstractFile }
 
-case class SnippetCompilerMessage(line: Int, column: Int, sourceLine: String, message: String)
+case class SnippetCompilerMessage(line: Int, column: Int, sourceLine: String, message: String, level: MessageLevel)
 
 case class SnippetCompilationResult(result: Option[AbstractFile], messages: Seq[SnippetCompilerMessage]):
-  def getSummary: String = messages.map(m => s"At ${m.line}:${m.column}:\n${m.sourceLine}Compiler: ${m.message}").mkString("\n")
+  def getSummary: String = messages.map(m => s"At ${m.line}:${m.column}:\n${m.sourceLine}${m.level.text}: ${m.message}").mkString("\n")
+
+
+enum MessageLevel(val text: String):
+  case Info extends MessageLevel("Info")
+  case Warning extends MessageLevel("Warning")
+  case Error extends MessageLevel("Error")
+

scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompiler.scala

@@ -16,6 +16,7 @@ import dotty.tools.dotc.{ Compiler, Run }
 import dotty.tools.io.{AbstractFile, VirtualDirectory}
 import dotty.tools.repl.AbstractFileClassLoader
 import dotty.tools.dotc.util.SourceFile
+import dotty.tools.dotc.interfaces.Diagnostic._
 
 class SnippetCompiler(
   classpath: String = System.getProperty("java.class.path"), //Probably needs to be done better
@@ -47,8 +48,11 @@ class SnippetCompiler(
       case diagnostic if diagnostic.position.isPresent =>
         val pos = diagnostic.position.get
         val msg = nullableMessage(diagnostic.message)
-        SnippetCompilerMessage(pos.line, pos.column, pos.lineContent, msg)
-      case d => SnippetCompilerMessage(-1, -1, "", nullableMessage(d.message))
+        val level = MessageLevel.fromOrdinal(diagnostic.level)
+        SnippetCompilerMessage(pos.line, pos.column, pos.lineContent, msg, level)
+      case d =>
+        val level = MessageLevel.fromOrdinal(d.level)
+        SnippetCompilerMessage(-1, -1, "", nullableMessage(d.message), level)
     }
     errorMessages
   }
@@ -64,8 +68,7 @@ class SnippetCompiler(
       .setReporter(new StoreReporter)
     val run = newRun(using context)
     run.compileFromStrings(snippets)
-    //Currently no warnings because of reporter implementation
-    val messages = createReportMessage(context.reporter.allErrors)
+    val messages = createReportMessage(context.reporter.pendingMessages(using context))
     val targetIfSuccessful = Option.when(!context.reporter.hasErrors)(target)
     SnippetCompilationResult(targetIfSuccessful, messages)
   }

scaladoc/test/dotty/tools/scaladoc/snippets/SnippetCompilerTest.scala

@@ -29,6 +29,15 @@ class SnippetCompilerTest {
 
   def assertFailedCompilation(str: List[String]): Unit = assertFailedCompilation(runTest(str))
 
+  def assertMessageLevelPresent(str: String, level: MessageLevel): Unit = assertMessageLevelPresent(runTest(str), level)
+
+  def assertMessageLevelPresent(res: SnippetCompilationResult, level: MessageLevel): Unit = res match {
+    case r @ SnippetCompilationResult(_, messages) => assertTrue(
+      s"Expected message with level: ${level.text}. Got result ${r.getSummary}",
+      messages.exists(_.level == level)
+    )
+  }
+
 
   @Test
   def snippetCompilerTest: Unit = {
@@ -43,8 +52,18 @@ class SnippetCompilerTest {
       |class A:
       |  val b: String
       |""".stripMargin
+    val warningSnippet = s"""
+      |package asd
+      |class A:
+      |  val a: Int = try {
+      |    5
+      |  }
+      |""".stripMargin
     assertSuccessfulCompilation(simpleCorrectSnippet)
     assertFailedCompilation(simpleIncorrectSnippet)
     assertFailedCompilation(List(simpleCorrectSnippet, simpleCorrectSnippet))
+    assertMessageLevelPresent(simpleIncorrectSnippet, MessageLevel.Error)
+    assertMessageLevelPresent(warningSnippet, MessageLevel.Warning)
+    //No test for Info
   }
 }