Skip to content

Commit 6c983a3

Browse files
Explicit Context to Printer conversion
1 parent 5b9947d commit 6c983a3

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
@@ -687,9 +687,6 @@ object Contexts {
687687

688688
object Context {
689689

690-
/** Implicit conversion that injects all printer operations into a context */
691-
implicit def toPrinter(ctx: Context): Printer = ctx.printer
692-
693690
/** implicit conversion that injects all ContextBase members into a context */
694691
implicit def toBase(ctx: Context): ContextBase = ctx.base
695692

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

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

10361036
override def toString =
10371037
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
@@ -616,12 +616,12 @@ object Symbols {
616616

617617
def toText(printer: Printer): Text = printer.toText(this)
618618

619-
def showLocated(implicit ctx: Context): String = ctx.locatedText(this).show
620-
def showExtendedLocation(implicit ctx: Context): String = ctx.extendedLocationText(this).show
621-
def showDcl(implicit ctx: Context): String = ctx.dclText(this).show
622-
def showKind(implicit ctx: Context): String = ctx.kindString(this)
623-
def showName(implicit ctx: Context): String = ctx.nameString(this)
624-
def showFullName(implicit ctx: Context): String = ctx.fullNameString(this)
619+
def showLocated(implicit ctx: Context): String = ctx.printer.locatedText(this).show
620+
def showExtendedLocation(implicit ctx: Context): String = ctx.printer.extendedLocationText(this).show
621+
def showDcl(implicit ctx: Context): String = ctx.printer.dclText(this).show
622+
def showKind(implicit ctx: Context): String = ctx.printer.kindString(this)
623+
def showName(implicit ctx: Context): String = ctx.printer.nameString(this)
624+
def showFullName(implicit ctx: Context): String = ctx.printer.fullNameString(this)
625625

626626
override def hashCode() = id // for debugging.
627627
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1838,7 +1838,7 @@ object messages {
18381838
val kind = "Compatibility"
18391839
val msg = "Failure to eliminate existential type. Proceed at own risk."
18401840
val explanation = {
1841-
val originalType = ctx.dclsText(boundSyms, "; ").show
1841+
val originalType = ctx.printer.dclsText(boundSyms, "; ").show
18421842
hl"""original type : $tp forSome ${originalType}
18431843
|reduces to : $tp1
18441844
|type used instead: $tp2"""
@@ -1978,7 +1978,7 @@ object messages {
19781978

19791979
val msg = {
19801980
val denotationOwner = denot.owner
1981-
val denotationName = ctx.fresh.setSetting(ctx.settings.YdebugNames, true).nameString(denot.name)
1981+
val denotationName = ctx.fresh.setSetting(ctx.settings.YdebugNames, true).printer.nameString(denot.name)
19821982
val file = denot.symbol.associatedFile
19831983
val (location, src) =
19841984
if (file != null) (s" in $file", file.toString)

0 commit comments

Comments
 (0)