Skip to content

Commit b70a353

Browse files
Explicit Context to Printer conversion
1 parent 8d3e6e9 commit b70a353

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

compiler/src/dotty/tools/dotc/core/Contexts.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -684,9 +684,6 @@ object Contexts {
684684

685685
object Context {
686686

687-
/** Implicit conversion that injects all printer operations into a context */
688-
implicit def toPrinter(ctx: Context): Printer = ctx.printer
689-
690687
/** implicit conversion that injects all ContextBase members into a context */
691688
implicit def toBase(ctx: Context): ContextBase = ctx.base
692689

compiler/src/dotty/tools/dotc/core/Denotations.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,7 @@ object Denotations {
10471047
/** Show declaration string; useful for showing declarations
10481048
* as seen from subclasses.
10491049
*/
1050-
def showDcl(implicit ctx: Context): String = ctx.dclText(this).show
1050+
def showDcl(implicit ctx: Context): String = ctx.printer.dclText(this).show
10511051

10521052
override def toString =
10531053
if (symbol == NoSymbol) symbol.toString

compiler/src/dotty/tools/dotc/core/Symbols.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -625,12 +625,12 @@ object Symbols {
625625

626626
def toText(printer: Printer): Text = printer.toText(this)
627627

628-
def showLocated(implicit ctx: Context): String = ctx.locatedText(this).show
629-
def showExtendedLocation(implicit ctx: Context): String = ctx.extendedLocationText(this).show
630-
def showDcl(implicit ctx: Context): String = ctx.dclText(this).show
631-
def showKind(implicit ctx: Context): String = ctx.kindString(this)
632-
def showName(implicit ctx: Context): String = ctx.nameString(this)
633-
def showFullName(implicit ctx: Context): String = ctx.fullNameString(this)
628+
def showLocated(implicit ctx: Context): String = ctx.printer.locatedText(this).show
629+
def showExtendedLocation(implicit ctx: Context): String = ctx.printer.extendedLocationText(this).show
630+
def showDcl(implicit ctx: Context): String = ctx.printer.dclText(this).show
631+
def showKind(implicit ctx: Context): String = ctx.printer.kindString(this)
632+
def showName(implicit ctx: Context): String = ctx.printer.nameString(this)
633+
def showFullName(implicit ctx: Context): String = ctx.printer.fullNameString(this)
634634

635635
override def hashCode() = id // for debugging.
636636
}

compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1821,7 +1821,7 @@ object messages {
18211821
val kind = "Compatibility"
18221822
val msg = "Failure to eliminate existential type. Proceed at own risk."
18231823
val explanation = {
1824-
val originalType = ctx.dclsText(boundSyms, "; ").show
1824+
val originalType = ctx.printer.dclsText(boundSyms, "; ").show
18251825
hl"""original type : $tp forSome ${originalType}
18261826
|reduces to : $tp1
18271827
|type used instead: $tp2"""
@@ -1961,7 +1961,7 @@ object messages {
19611961

19621962
val msg = {
19631963
val denotationOwner = denot.owner
1964-
val denotationName = ctx.fresh.setSetting(ctx.settings.YdebugNames, true).nameString(denot.name)
1964+
val denotationName = ctx.fresh.setSetting(ctx.settings.YdebugNames, true).printer.nameString(denot.name)
19651965
val file = denot.symbol.associatedFile
19661966
val (location, src) =
19671967
if (file != null) (s" in $file", file.toString)

0 commit comments

Comments
 (0)