Update metabrowse to 0.2.8

build.sc

@@ -140,19 +140,9 @@ class ScalaInterpreter(val crossScalaVersion: String) extends AlmondModule with
     shared.interpreter(),
     scala.`scala-kernel-api`()
   )
-  def addMetabrowse = T{
-    val sv = scalaVersion()
-    val patch = sv
-      .split('.')
-      .drop(2)
-      .headOption
-      .flatMap(s => _root_.scala.util.Try(s.takeWhile(_.isDigit).toInt).toOption)
-    (sv.startsWith("2.12.") && patch.exists(_ <= 10)) ||
-      (sv.startsWith("2.13.") && patch.exists(_ <= 1))
-  }
   def ivyDeps = T{
     val metabrowse =
-      if (addMetabrowse()) Agg(Deps.metabrowseServer)
+      if (crossScalaVersion.startsWith("2.")) Agg(Deps.metabrowseServer)
       else Agg.empty
     metabrowse ++ Agg(
       Deps.coursier.withDottyCompat(crossScalaVersion),
@@ -163,13 +153,6 @@ class ScalaInterpreter(val crossScalaVersion: String) extends AlmondModule with
       Deps.ammoniteRepl(crossScalaVersion)
     )
   }
-  def sources = T.sources {
-    val dirName =
-      if (addMetabrowse()) "scala-has-metabrowse"
-      else "scala-no-metabrowse"
-    val extra = PathRef(millSourcePath / "src" / "main" / dirName)
-    super.sources() ++ Seq(extra)
-  }
   object test extends Tests with AlmondTestModule {
     def moduleDeps = {
       val rx =

modules/scala/scala-interpreter/src/main/scala-has-metabrowse/almond/internals/ScalaInterpreterInspections.scala → modules/scala/scala-interpreter/src/main/scala-2/almond/internals/ScalaInterpreterInspections.scala

@@ -12,6 +12,7 @@ import ammonite.runtime.Frame
 import ammonite.util.Ref
 import ammonite.util.Util.newLine
 import metabrowse.server.{MetabrowseServer, Sourcepath}
+import scala.meta.dialects
 
 import scala.tools.nsc.Global
 import scala.tools.nsc.interactive.{Global => Interactive}
@@ -58,7 +59,16 @@ final class ScalaInterpreterInspections(
       else
         ConnectionParameters.randomPort()
 
+    val dialect =
+      if (compilerManager.scalaVersion.startsWith("3."))
+        dialects.Scala3
+      else if (compilerManager.scalaVersion.startsWith("2.13."))
+        dialects.Scala213
+      else
+        dialects.Scala212
+
     val server = new MetabrowseServer(
+      dialect,
       host = metabrowseHost,
       port = port
       // FIXME Pass custom logger?

project/deps.sc

@@ -50,7 +50,7 @@ object Deps {
   def jsoniterScalaMacros      = ivy"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-macros:${Versions.jsoniterScala}"
   def jvmRepr                  = ivy"com.github.jupyter:jvm-repr:0.4.0"
   def mdoc                     = ivy"org.scalameta::mdoc:2.3.3"
-  def metabrowseServer         = ivy"org.scalameta::metabrowse-server:0.2.3"
+  def metabrowseServer         = ivy"org.scalameta:::metabrowse-server:0.2.8"
   def scalafmtDynamic          = ivy"org.scalameta::scalafmt-dynamic:${Versions.scalafmt}"
   def scalaReflect(sv: String) = ivy"org.scala-lang:scala-reflect:$sv"
   def scalaRx                  = ivy"com.lihaoyi::scalarx:0.4.3"