Skip to content

Commit e5cc4ac

Browse files
Try to use scala/scala3#5870
1 parent f226161 commit e5cc4ac

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

sourcecode/shared/src/main/dotty/sourcecode/Macros.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,8 @@ object Macros {
195195

196196
def text[T: Type](v: Expr[T])(implicit c: Reflection): Expr[sourcecode.Text[T]] = {
197197
import c._
198-
import scala.quoted.Toolbox.Default._
199-
val txt = v.show
200-
'(sourcecode.Text[T](~v, ~txt.toExpr))
198+
val txt = v.unseal.underlyingArgument.pos.sourceCode.toString.toExpr
199+
'(sourcecode.Text[T](~v, ~txt))
201200
}
202201

203202
sealed trait Chunk

sourcecode/shared/src/test/scala/sourcecode/TextTests.scala

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ object TextTests {
55
assert(foo(1) == (1, "1"))
66
val bar = Seq("lols")
77
assert(foo(bar) == (Seq("lols"), "bar"))
8-
// FIXME Don't pass on dotty (second element not ok)
9-
if (TestUtil.isDotty) {
10-
assert(foo(Symbol("lol").toString * 2)._1 == "'lol'lol")
11-
assert(foo{println("Hello"); Symbol("lol").toString * 2}._1 == "'lol'lol")
12-
} else {
13-
assert(foo(Symbol("lol").toString * 2) == ("'lol'lol", "Symbol(\"lol\").toString * 2"))
14-
assert(foo{println("Hello"); Symbol("lol").toString * 2} == ("'lol'lol", "Symbol(\"lol\").toString * 2"))
15-
}
8+
assert(
9+
foo(Symbol("lol").toString * 2) == ("'lol'lol", "Symbol(\"lol\").toString * 2"),
10+
s"Expected: ${("'lol'lol", "Symbol(\"lol\").toString * 2")}, got: ${foo(Symbol("lol").toString * 2)}"
11+
)
12+
assert(foo{println("Hello"); Symbol("lol").toString * 2} == ("'lol'lol", "Symbol(\"lol\").toString * 2"))
1613
}
1714
def foo[T](v: sourcecode.Text[T]) = (v.value, v.source)
1815
}

0 commit comments

Comments
 (0)