FormatWriter: escape end marker labels if needed

scalameta · Sep 17, 2021 · 345cdc7 · 345cdc7
1 parent d71411d
commit 345cdc7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala
@@ -92,7 +92,10 @@ class FormatWriter(formatOps: FormatOps) {
             sb.append(getNewlines(numBlanks))
               .append(getIndentation(indent))
               .append("end ")
-              .append(label)
+            val escape = !nonOpIdPattern.matcher(label).matches()
+            if (escape) sb.append('`')
+            sb.append(label)
+            if (escape) sb.append('`')
           }
         }
 
@@ -1637,6 +1640,8 @@ object FormatWriter {
   private def splitAsIterator(regex: Pattern)(value: String): Iterator[String] =
     regex.splitAsStream(value).iterator().asScala
 
+  private val nonOpIdPattern = Pattern.compile("\\w+")
+
   // "slc" stands for single-line comment
   private val slcDelim = Pattern.compile("\\h++")
   // "mlc" stands for multi-line comment

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat
@@ -1975,8 +1975,6 @@ rewrite.scala3.insertEndMarkerMinLines = 1
 object `Accept-Ranges`:
   val r = ""
 >>>
-test does not parse
 object `Accept-Ranges`:
    val r = ""
-end Accept-Ranges
-^
+end `Accept-Ranges`
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat
@@ -1924,8 +1924,6 @@ rewrite.scala3.insertEndMarkerMinLines = 1
 object `Accept-Ranges`:
   val r = ""
 >>>
-test does not parse
 object `Accept-Ranges`:
    val r = ""
-end Accept-Ranges
-^
+end `Accept-Ranges`
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat
@@ -2016,8 +2016,6 @@ rewrite.scala3.insertEndMarkerMinLines = 1
 object `Accept-Ranges`:
   val r = ""
 >>>
-test does not parse
 object `Accept-Ranges`:
    val r = ""
-end Accept-Ranges
-^
+end `Accept-Ranges`
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat
@@ -2134,8 +2134,6 @@ rewrite.scala3.insertEndMarkerMinLines = 1
 object `Accept-Ranges`:
   val r = ""
 >>>
-test does not parse
 object `Accept-Ranges`:
    val r = ""
-end Accept-Ranges
-^
+end `Accept-Ranges`