Skip to content

Two fixes in trace showing #16200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 23, 2022
Merged

Two fixes in trace showing #16200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions compiler/src/dotty/tools/dotc/reporting/trace.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ package reporting

import scala.language.unsafeNulls

import core.Contexts._
import config.Config
import config.Printers
import core.Mode
import core.*, Contexts.*, Decorators.*
import config.*
import printing.Formatting.*

import scala.compiletime.*

/** Exposes the {{{ trace("question") { op } }}} syntax.
*
Expand Down Expand Up @@ -51,9 +52,20 @@ trait TraceSyntax:
else op

inline def apply[T](inline question: String, inline printer: Printers.Printer, inline show: Boolean)(inline op: T)(using Context): T =
inline if isEnabled then
doTrace[T](question, printer, if show then showShowable(_) else alwaysToString)(op)
else op
apply(question, printer, {
val showOp: T => String = inline if show == true then
val showT = summonInline[Show[T]]
{
given Show[T] = showT
t => i"$t"
}
else
summonFrom {
case given Show[T] => t => i"$t"
case _ => alwaysToString
}
showOp
})(op)

inline def apply[T](inline question: String, inline printer: Printers.Printer)(inline op: T)(using Context): T =
apply[T](question, printer, false)(op)
Expand All @@ -64,15 +76,11 @@ trait TraceSyntax:
inline def apply[T](inline question: String)(inline op: T)(using Context): T =
apply[T](question, false)(op)

private def showShowable(x: Any)(using Context) = x match
case x: printing.Showable => x.show
case _ => String.valueOf(x)

private val alwaysToString = (x: Any) => String.valueOf(x)

private def doTrace[T](question: => String,
printer: Printers.Printer = Printers.default,
showOp: T => String = alwaysToString)
showOp: T => String)
(op: => T)(using Context): T =
if ctx.mode.is(Mode.Printing) || !isForced && (printer eq Printers.noPrinter) then op
else
Expand Down