Drop more ctx bindings

Author: odersky

compiler/src/dotty/tools/dotc/ast/Trees.scala

@@ -1445,14 +1445,17 @@ object Trees {
             case UnApply(fun, implicits, patterns) =>
               this(this(this(x, fun), implicits), patterns)
             case tree @ ValDef(_, tpt, _) =>
-              implicit val ctx = localCtx
-              this(this(x, tpt), tree.rhs)
+              withContext(localCtx) {
+                this(this(x, tpt), tree.rhs)
+              }
             case tree @ DefDef(_, tparams, vparamss, tpt, _) =>
-              implicit val ctx = localCtx
-              this(this(vparamss.foldLeft(this(x, tparams))(apply), tpt), tree.rhs)
+              withContext(localCtx) {
+                this(this(vparamss.foldLeft(this(x, tparams))(apply), tpt), tree.rhs)
+              }
             case TypeDef(_, rhs) =>
-              implicit val ctx = localCtx
-              this(x, rhs)
+              withContext(localCtx) {
+                this(x, rhs)
+              }
             case tree @ Template(constr, parents, self, _) if tree.derived.isEmpty =>
               this(this(this(this(x, constr), parents), self), tree.body)
             case Import(expr, _) =>

compiler/src/dotty/tools/dotc/config/PathResolver.scala

@@ -24,7 +24,7 @@ object PathResolver {
    */
   def makeAbsolute(cp: String): String = ClassPath.map(cp, x => Path(x).toAbsolute.path)
 
-  /** pretty print class path 
+  /** pretty print class path
    */
   def ppcp(s: String): String = split(s) match {
     case Nil      => ""
@@ -51,7 +51,7 @@ object PathResolver {
     def scalaHome: String           = propOrEmpty("scala.home")
     def scalaExtDirs: String        = propOrEmpty("scala.ext.dirs")
 
-    /** The java classpath and whether to use it. 
+    /** The java classpath and whether to use it.
      */
     def javaUserClassPath: String   = propOrElse("java.class.path", "")
     def useJavaClassPath: Boolean    = propOrFalse("scala.usejavacp")
@@ -134,16 +134,15 @@ object PathResolver {
   }
 
   /** Show values in Environment and Defaults when no argument is provided.
-   *  Otherwise, show values in Calculated as if those options had been given 
+   *  Otherwise, show values in Calculated as if those options had been given
    *  to a scala runner.
    */
   def main(args: Array[String]): Unit =
     if (args.isEmpty) {
       println(Environment)
       println(Defaults)
     }
-    else {
-      implicit val ctx = (new ContextBase).initialCtx
+    else withContext(ContextBase().initialCtx) {
       val ArgsSummary(sstate, rest, errors, warnings) =
         ctx.settings.processArguments(args.toList, true)
       errors.foreach(println)
@@ -165,7 +164,7 @@ class PathResolver(implicit ctx: Context) {
 
   private val classPathFactory = new ClassPathFactory
 
-  private def cmdLineOrElse(name: String, alt: String) = 
+  private def cmdLineOrElse(name: String, alt: String) =
     commandLineFor(name) match {
       case Some("") | None => alt
       case Some(x)         => x

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

@@ -15,9 +15,8 @@ object Comments {
   val ContextDoc: Key[ContextDocstrings] = new Key[ContextDocstrings]
 
   /** Decorator for getting docbase out of context */
-  implicit class CommentsContext(val ctx: Context) extends AnyVal {
-    def docCtx: Option[ContextDocstrings] = ctx.property(ContextDoc)
-  }
+  extension CommentsContext on (c: Context):
+    def docCtx: Option[ContextDocstrings] = c.property(ContextDoc)
 
   /** Context for Docstrings, contains basic functionality for getting
     * docstrings via `Symbol` and expanding templates

compiler/src/dotty/tools/dotc/typer/Docstrings.scala

@@ -3,7 +3,7 @@ package dotc
 package typer
 
 import core._
-import Contexts._, Symbols._, Decorators._, Comments._
+import Contexts._, Symbols._, Decorators._, Comments.{_, given _}
 import ast.tpd
 
 object Docstrings {

compiler/src/dotty/tools/dotc/typer/Namer.scala

@@ -4,9 +4,9 @@ package typer
 
 import core._
 import ast._
-import Trees._, StdNames._, Scopes._, Denotations._, Comments._
+import Trees._, StdNames._, Scopes._, Denotations._
 import Contexts._, Symbols._, Types._, SymDenotations._, Names._, NameOps._, Flags._
-import Decorators.{given _}
+import Decorators.{given _}, Comments.{_, given _}
 import NameKinds.DefaultGetterName
 import TypeApplications.TypeParamInfo
 import ast.desugar, ast.desugar._

doc-tool/src/dotty/tools/dottydoc/util/syntax.scala

@@ -3,7 +3,7 @@ package dottydoc
 package util
 
 import dotc.core.Contexts.Context
-import dotc.core.Comments._
+import dotc.core.Comments.{_, given _}
 import model.Package
 import core.ContextDottydoc
 import dotc.core.Symbols._