From 20790b64ce686d9363c0fb420c069726dc9f13b9 Mon Sep 17 00:00:00 2001
From: Vadim Chelyshov <qtankle@gmail.com>
Date: Tue, 19 Oct 2021 19:30:41 +0300
Subject: [PATCH] Add Scala 3.1.0 support

---
 .github/workflows/ci.yml                                  | 2 +-
 .gitignore                                                | 1 +
 build.sbt                                                 | 4 ++--
 mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt  | 2 +-
 .../scala-3/mdoc/internal/markdown/MarkdownCompiler.scala | 2 +-
 project/plugins.sbt                                       | 2 +-
 tests/unit-js/src/test/scala/tests/js/JsSuite.scala       | 8 --------
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc56d456f..37680c736 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
           - "'++2.12.12 test'"
           - "'++2.12.14 test' scripted"
           - "'++2.13.6 test'"
-          - "'++3.0.1 test'"
+          - "'++3.1.0 test'"
     steps:
       - uses: actions/checkout@v2
       - uses: olafurpg/setup-scala@v13
diff --git a/.gitignore b/.gitignore
index f2757451a..0364f11e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ out/
 .bloop/
 metals.sbt
 .vscode/
+.bsp
 
 website/translated_docs
 website/build/
diff --git a/build.sbt b/build.sbt
index 359969e77..d999fa011 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,11 +3,11 @@ import scala.collection.mutable
 def scala212 = "2.12.15"
 def scala211 = "2.11.12"
 def scala213 = "2.13.6"
-def scala3 = "3.0.2"
+def scala3 = "3.1.0"
 def scala2Versions = List(scala212, scala211, scala213)
 def allScalaVersions = scala2Versions :+ scala3
 
-def scalajs = "1.5.1"
+def scalajs = "1.7.1"
 def scalajsBinaryVersion = "1"
 def scalajsDom = "1.1.0"
 
diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt
index 299dab883..c2e31bacd 100644
--- a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt
+++ b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % sys.props("plugin.version"))
 addSbtCoursier
diff --git a/mdoc/src/main/scala-3/mdoc/internal/markdown/MarkdownCompiler.scala b/mdoc/src/main/scala-3/mdoc/internal/markdown/MarkdownCompiler.scala
index 1896e25a4..66c0f0796 100644
--- a/mdoc/src/main/scala-3/mdoc/internal/markdown/MarkdownCompiler.scala
+++ b/mdoc/src/main/scala-3/mdoc/internal/markdown/MarkdownCompiler.scala
@@ -124,7 +124,7 @@ class MarkdownCompiler(
     report(vreporter, input, fileImports, run.runContext, edit)
   }
 
-  class CollectionReporter extends dotty.tools.dotc.reporting.Reporter {
+  class CollectionReporter extends dotty.tools.dotc.reporting.Reporter with UniqueMessagePositions {
     val allDiags = List.newBuilder[Diagnostic]
 
     override def doReport(dia: Diagnostic)(using Context) = 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index f20b7917a..a976be1f6 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,7 +1,7 @@
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")
 
 libraryDependencies ++= List(
diff --git a/tests/unit-js/src/test/scala/tests/js/JsSuite.scala b/tests/unit-js/src/test/scala/tests/js/JsSuite.scala
index 4e502b927..eae3a5c8d 100644
--- a/tests/unit-js/src/test/scala/tests/js/JsSuite.scala
+++ b/tests/unit-js/src/test/scala/tests/js/JsSuite.scala
@@ -300,14 +300,6 @@ class JsSuite extends BaseMarkdownSuite {
           |no-dom.md:3 (mdoc generated code)
           | value scalajs is not a member of org
           |def run0(node: _root_.org.scalajs.dom.raw.HTMLElement): Unit = {
-          |
-          |
-          |error:
-          |no-dom.md:3 (mdoc generated code)
-          | (<error value scalajs is not a member of org>#dom.raw :
-          |  <error value scalajs is not a member of org>
-          |) is not a valid type prefix, since it is not an immutable path
-          |def run0(node: _root_.org.scalajs.dom.raw.HTMLElement): Unit = {
       """.stripMargin
     )
   )