Merge pull request scala#13186 from dotty-staging/fix-#13181

anatoliykmetyuk · web-flow · commit 5c6d352c4dbe · 2021-08-02T08:57:11.000+02:00
Remove color from scala.compiletime.codeOf
diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala
@@ -379,7 +379,8 @@ object Inliner {
 
     /** Expand call to scala.compiletime.codeOf */
     def codeOf(arg: Tree, pos: SrcPos)(using Context): Tree =
-      Literal(Constant(arg.show)).withSpan(pos.span)
+      val ctx1 = ctx.fresh.setSetting(ctx.settings.color, "never")
+      Literal(Constant(arg.show(using ctx1))).withSpan(pos.span)
   }
 
   extension (tp: Type) {
diff --git a/compiler/test-resources/repl/i13181 b/compiler/test-resources/repl/i13181
@@ -0,0 +1,2 @@
+scala> scala.compiletime.codeOf(1+2)
+val res0: String = 1.+(2)
diff --git a/tests/run/i13181.scala b/tests/run/i13181.scala
@@ -0,0 +1 @@
+@main def Test = assert(scala.compiletime.codeOf(1+2) == "1.+(2)")

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,8 @@ object Inliner {`
`379`	`379`
`380`	`380`	`/** Expand call to scala.compiletime.codeOf */`
`381`	`381`	`def codeOf(arg: Tree, pos: SrcPos)(using Context): Tree =`
`382`		`- Literal(Constant(arg.show)).withSpan(pos.span)`
	`382`	`+ val ctx1 = ctx.fresh.setSetting(ctx.settings.color, "never")`
	`383`	`+ Literal(Constant(arg.show(using ctx1))).withSpan(pos.span)`
`383`	`384`	`}`
`384`	`385`
`385`	`386`	`extension (tp: Type) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+scala> scala.compiletime.codeOf(1+2)`
	`2`	`+val res0: String = 1.+(2)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+@main def Test = assert(scala.compiletime.codeOf(1+2) == "1.+(2)")`