Make printing capture sets dependent on -Ycc-debug

Author: odersky

compiler/src/dotty/tools/dotc/cc/CaptureSet.scala

@@ -315,8 +315,11 @@ object CaptureSet:
       deps.foreach(_.propagateSolved())
 
     override def toText(printer: Printer): Text =
+      def debug = inContext(printer.printerContext) {
+        ctx.settings.YccDebug.value
+      }
       super.toText(printer)
-      ~ (id.toString ~ getClass.getSimpleName.take(1) provided !isConst)
+      ~ (id.toString ~ getClass.getSimpleName.take(1) provided !isConst && debug)
 
     override def toString = s"Var$id$elems"
   end Var

compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala

@@ -18,11 +18,12 @@ import config.Config
 import cc.{CapturingType, CaptureSet}
 
 class PlainPrinter(_ctx: Context) extends Printer {
+
   /** The context of all public methods in Printer and subclasses.
    *  Overridden in RefinedPrinter.
    */
-  protected def curCtx: Context = _ctx.addMode(Mode.Printing)
-  protected given [DummyToEnforceDef]: Context = curCtx
+  def printerContext: Context = _ctx.addMode(Mode.Printing)
+  protected given [DummyToEnforceDef]: Context = printerContext
 
   protected def printDebug = ctx.settings.YprintDebug.value
 

compiler/src/dotty/tools/dotc/printing/Printer.scala

@@ -6,7 +6,7 @@ import core._
 import Texts._, ast.Trees._
 import Types.{Type, SingletonType, LambdaParam},
        Symbols.Symbol, Scopes.Scope, Constants.Constant,
-       Names.Name, Denotations._, Annotations.Annotation
+       Names.Name, Denotations._, Annotations.Annotation, Contexts.Context
 import typer.Implicits.SearchResult
 import util.SourcePosition
 import typer.ImportInfo
@@ -185,6 +185,9 @@ abstract class Printer {
 
   /** A plain printer without any embellishments */
   def plain: Printer
+
+  /** The context in which this printer operates */
+  def printerContext: Context
 }
 object Printer {
 

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -34,11 +34,11 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
 
   /** A stack of enclosing DefDef, TypeDef, or ClassDef, or ModuleDefs nodes */
   private var enclosingDef: untpd.Tree = untpd.EmptyTree
-  private var myCtx: Context = super.curCtx
+  private var myCtx: Context = super.printerContext
   private var printPos = ctx.settings.YprintPos.value
   private val printLines = ctx.settings.printLines.value
 
-  override protected def curCtx: Context = myCtx
+  override def printerContext: Context = myCtx
 
   def withEnclosingDef(enclDef: Tree[? >: Untyped])(op: => Text): Text = {
     val savedCtx = myCtx