From 9a10ccbc377632c43247640b67bf2596614ec5f9 Mon Sep 17 00:00:00 2001
From: tgodzik <tgodzik@virtuslab.com>
Date: Wed, 9 Sep 2020 13:56:41 +0200
Subject: [PATCH] Update scalameta and allow for escaping quotes

---
 .scalafmt.conf                                    |  5 ++---
 build.sbt                                         |  2 +-
 .../mdoc/internal/document/DocumentBuilder.scala  |  2 +-
 .../scala/tests/worksheets/WorksheetSuite.scala   | 15 +++++++++++++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/.scalafmt.conf b/.scalafmt.conf
index 19fb989d..16d384ce 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -8,7 +8,6 @@ assumeStandardLibraryStripMargin = true
 project.excludeFilters = [
   "mdoc/src/main/scala-3"
   "runtime/src/main/scala-3"
-  "printing/src/main/scala-3"
-  "printing/src/main/scala-0.26"
-  "printing/src/main/scala-0.27"
+  "runtime/src/main/scala-0.26"
+  "runtime/src/main/scala-0.27"
 ]
diff --git a/build.sbt b/build.sbt
index 40949a37..8fdd3af3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -109,7 +109,7 @@ lazy val sharedSettings = List(
 )
 
 val V = new {
-  val scalameta = "4.3.20"
+  val scalameta = "4.3.22"
   val munit = "0.7.12"
   val coursier = "0.0.25"
 }
diff --git a/runtime/src/main/scala/mdoc/internal/document/DocumentBuilder.scala b/runtime/src/main/scala/mdoc/internal/document/DocumentBuilder.scala
index bc190ceb..2210672c 100644
--- a/runtime/src/main/scala/mdoc/internal/document/DocumentBuilder.scala
+++ b/runtime/src/main/scala/mdoc/internal/document/DocumentBuilder.scala
@@ -78,7 +78,7 @@ trait DocumentBuilder {
           case MdocNonFatal(e) =>
             CrashResult.Crashed(e, pos)
         }
-      // We can't generate macros in the same unit and the name or result will be "result" anyway
+      // We can't generate macros in the same unit and the name of result will be "result" anyway
       myBinders.append(new Binder(result, "result", tprint, pos))
     }
 
diff --git a/tests/worksheets/src/test/scala/tests/worksheets/WorksheetSuite.scala b/tests/worksheets/src/test/scala/tests/worksheets/WorksheetSuite.scala
index 1c0735c5..ee186aa9 100644
--- a/tests/worksheets/src/test/scala/tests/worksheets/WorksheetSuite.scala
+++ b/tests/worksheets/src/test/scala/tests/worksheets/WorksheetSuite.scala
@@ -314,6 +314,21 @@ class WorksheetSuite extends BaseSuite {
        |""".stripMargin
   )
 
+  checkDecorations(
+    "dotty-interpolation".tag(OnlyScala3),
+    """|val name = "Ben"
+       |val quoted = s"$"$name$""
+       |quoted
+       |""".stripMargin,
+    """|<val name = "Ben"> // : String = Ben
+       |name: String = Ben
+       |<val quoted = s"$"$name$""> // : String = "Ben"
+       |quoted: String = "Ben"
+       |<quoted> // : String = "Ben"
+       |res0: String = "Ben"
+       |""".stripMargin
+  )
+
   checkDecorations(
     "dotty-imports".tag(OnlyScala3),
     """|import $dep.`com.lihaoyi:scalatags_2.13:0.9.1`