review changes

scalameta · Oct 3, 2023 · 3a2b778 · 3a2b778
1 parent 5f05763
commit 3a2b778
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 7 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/metals/doctor/DoctorResults.scala b/metals/src/main/scala/scala/meta/internal/metals/doctor/DoctorResults.scala
@@ -20,7 +20,7 @@ final case class DoctorResults(
 
 object DoctorResults {
   // Version of the Doctor json that is returned.
-  val version = 4
+  val version = 5
 }
 
 final case class DoctorFolderResults(
@@ -41,6 +41,7 @@ final case class DoctorFolderResults(
     )
     targets.foreach(targetList => json("targets") = targetList.map(_.toJson))
     json("explanations") = explanations
+    json("errorReports") = errorReports.map(_.toJson)
     json
   }
 }
@@ -168,4 +169,15 @@ final case class ErrorReportInfo(
     uri: String,
     buildTarget: Option[String],
     shortSummary: String,
-)
+) {
+  def toJson: Obj = {
+    val json = ujson.Obj(
+      "name" -> name,
+      "timestamp" -> timestamp,
+      "uri" -> uri,
+      "shortSummary" -> shortSummary,
+    )
+    buildTarget.foreach(json("buildTarget") = _)
+    json
+  }
+}
diff --git a/mtags-shared/src/main/scala/scala/meta/internal/mtags/CommonMtagsEnrichments.scala b/mtags-shared/src/main/scala/scala/meta/internal/mtags/CommonMtagsEnrichments.scala
@@ -358,16 +358,25 @@ trait CommonMtagsEnrichments {
           s"""|range: ${r.start} - ${r.end}
               |uri: ${r.uri()}
               |text:
-              |$withMarkers""".stripMargin
+              |```scala
+              |$withMarkers
+              |```
+              |""".stripMargin
         case o: OffsetParams =>
           s"""|offset: ${o.offset()}
               |uri: ${o.uri()}
               |text:
-              |${textWithPosMarker(o.offset(), o.text())}""".stripMargin
+              |```scala
+              |${textWithPosMarker(o.offset(), o.text())}
+              |```
+              |""".stripMargin
         case v =>
           s"""|uri: ${v.uri()}
               |text:
-              |${v.text()}""".stripMargin
+              |```scala
+              |${v.text()}
+              |```
+              |""".stripMargin
       }
     }
   }

diff --git a/mtags/src/main/scala-2/scala/meta/internal/pc/HoverProvider.scala b/mtags/src/main/scala-2/scala/meta/internal/pc/HoverProvider.scala
@@ -63,10 +63,14 @@ class HoverProvider(val compiler: MetalsGlobal, params: OffsetParams)(implicit
             |tpe: ${tree.tpe}
             |
             |tree:
+            |```scala
             |$tree
+            |```
             |
             |full tree:
+            |```scala
             |${unit.body}
+            |```
             |""".stripMargin,
         s"empty hover in $fileName",
         s"$fileName::$posId"

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/HoverProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/HoverProvider.scala
@@ -66,9 +66,19 @@ object HoverProvider:
               |has error: ${tpw.isError}
               |
               |path:
-              |- ${path.map(_.toString()).mkString("\n- ")}
+              |${path
+               .map(tree => s"""|```scala
+                                |$tree
+                                |```
+                                |""".stripMargin)
+               .mkString("\n")}
               |trees:
-              |- ${trees.map(_.toString()).mkString("\n- ")}
+              |${trees
+               .map(tree => s"""|```scala
+                                |$tree
+                                |```
+                                |""".stripMargin)
+               .mkString("\n")}
               |""".stripMargin,
           s"empty hover in $uri",
           s"$uri::$posId",