Skip to content

Commit 2392829

Browse files
committed
FormatWriter: valid syntax for end marker labels
1 parent d71411d commit 2392829

File tree

5 files changed

+17
-25
lines changed

5 files changed

+17
-25
lines changed

Diff for: scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala

+13-13
Original file line numberDiff line numberDiff line change
@@ -1671,35 +1671,35 @@ object FormatWriter {
16711671
private def getEndMarkerLabel(tree: Tree): String = tree match {
16721672
// templates
16731673
case _: Term.NewAnonymous => "new"
1674-
case t: Defn.Class => t.name.value
1675-
case t: Defn.Object => t.name.value
1676-
case t: Defn.Trait => t.name.value
1677-
case t: Defn.Enum => t.name.value
1674+
case t: Defn.Class => t.name.toString
1675+
case t: Defn.Object => t.name.toString
1676+
case t: Defn.Trait => t.name.toString
1677+
case t: Defn.Enum => t.name.toString
16781678
case t: Defn.Given =>
1679-
val label = t.name.value
1679+
val label = t.name.toString
16801680
if (label.isEmpty) "given" else label
1681-
case t: Pkg.Object => t.name.value
1681+
case t: Pkg.Object => t.name.toString
16821682
// definitions
1683-
case t: Defn.Def => t.name.value
1683+
case t: Defn.Def => t.name.toString
16841684
case t: Defn.GivenAlias =>
1685-
val label = t.name.value
1685+
val label = t.name.toString
16861686
if (label.isEmpty) "given" else label
1687-
case t: Defn.Type => t.name.value
1687+
case t: Defn.Type => t.name.toString
16881688
case t: Defn.Val =>
16891689
t.pats match {
1690-
case List(Pat.Var(n)) => n.value
1690+
case List(Pat.Var(n)) => n.toString
16911691
case _ => "val"
16921692
}
16931693
case t: Defn.Var =>
16941694
t.pats match {
1695-
case List(Pat.Var(n)) => n.value
1695+
case List(Pat.Var(n)) => n.toString
16961696
case _ => "var"
16971697
}
16981698
// other
16991699
case t: Pkg =>
17001700
t.ref match {
1701-
case x: Term.Name => x.value
1702-
case x: Term.Select => x.name.value
1701+
case x: Term.Name => x.toString
1702+
case x: Term.Select => x.name.toString
17031703
case _ => null
17041704
}
17051705
case _: meta.Ctor.Secondary => "this"

Diff for: scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat

+1-3
Original file line numberDiff line numberDiff line change
@@ -1975,8 +1975,6 @@ rewrite.scala3.insertEndMarkerMinLines = 1
19751975
object `Accept-Ranges`:
19761976
val r = ""
19771977
>>>
1978-
test does not parse
19791978
object `Accept-Ranges`:
19801979
val r = ""
1981-
end Accept-Ranges
1982-
^
1980+
end `Accept-Ranges`

Diff for: scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat

+1-3
Original file line numberDiff line numberDiff line change
@@ -1924,8 +1924,6 @@ rewrite.scala3.insertEndMarkerMinLines = 1
19241924
object `Accept-Ranges`:
19251925
val r = ""
19261926
>>>
1927-
test does not parse
19281927
object `Accept-Ranges`:
19291928
val r = ""
1930-
end Accept-Ranges
1931-
^
1929+
end `Accept-Ranges`

Diff for: scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat

+1-3
Original file line numberDiff line numberDiff line change
@@ -2016,8 +2016,6 @@ rewrite.scala3.insertEndMarkerMinLines = 1
20162016
object `Accept-Ranges`:
20172017
val r = ""
20182018
>>>
2019-
test does not parse
20202019
object `Accept-Ranges`:
20212020
val r = ""
2022-
end Accept-Ranges
2023-
^
2021+
end `Accept-Ranges`

Diff for: scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat

+1-3
Original file line numberDiff line numberDiff line change
@@ -2134,8 +2134,6 @@ rewrite.scala3.insertEndMarkerMinLines = 1
21342134
object `Accept-Ranges`:
21352135
val r = ""
21362136
>>>
2137-
test does not parse
21382137
object `Accept-Ranges`:
21392138
val r = ""
2140-
end Accept-Ranges
2141-
^
2139+
end `Accept-Ranges`

0 commit comments

Comments
 (0)