Drop protected[this] from compiler codebase

Author: odersky

compiler/src/dotty/tools/dotc/Run.scala

@@ -39,7 +39,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
    *                 for type checking.
    *    imports      For each element of RootImports, an import context
    */
-  protected[this] def rootContext(implicit ctx: Context): Context = {
+  protected def rootContext(implicit ctx: Context): Context = {
     ctx.initialize()(ctx)
     ctx.base.setPhasePlan(comp.phases)
     val rootScope = new MutableScope
@@ -66,7 +66,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
   /** The context created for this run */
   def runContext: Context = myCtx
 
-  protected[this] implicit def ctx: Context = myCtx
+  protected implicit def ctx: Context = myCtx
   assert(ctx.runId <= Periods.MaxPossibleRunId)
 
   private[this] var myUnits: List[CompilationUnit] = _

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

@@ -1668,7 +1668,7 @@ object Types {
 
   /**  Instances of this class are cached and are proxies. */
   abstract class CachedProxyType extends TypeProxy with CachedType {
-    protected[this] var myHash: Int = HashUnknown
+    protected var myHash: Int = HashUnknown
     final def hash: Int = {
       if (myHash == HashUnknown) {
         myHash = computeHash(null)
@@ -2894,8 +2894,8 @@ object Types {
 
   /** A trait that mixes in functionality for signature caching */
   trait SignatureCachingType extends TermType {
-    protected[this] var mySignature: Signature = _
-    protected[this] var mySignatureRunId: Int = NoRunId
+    protected var mySignature: Signature = _
+    protected var mySignatureRunId: Int = NoRunId
 
     protected def computeSignature(implicit ctx: Context): Signature
 

compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Flags.scala

@@ -32,7 +32,7 @@ object Scala2Flags {
   final val BYNAMEPARAM   = 1 << 16       // parameter is by name
   final val CONTRAVARIANT = 1 << 17       // symbol is a contravariant type variable
   final val ABSOVERRIDE   = 1 << 18       // combination of abstract & override
-  final val LOCAL         = 1 << 19       // symbol is local to current class (i.e. private[this] or protected[this]
+  final val LOCAL         = 1 << 19       // symbol is local to current class (i.e. private[this] or protected
                                           // pre: PRIVATE or PROTECTED are also set
   final val JAVA          = 1 << 20       // symbol was defined by a Java class
   final val STATIC        = 1 << 23       // static field, method or class

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

@@ -15,8 +15,8 @@ import scala.util.control.NonFatal
 import scala.annotation.switch
 
 class PlainPrinter(_ctx: Context) extends Printer {
-  protected[this] implicit def ctx: Context = _ctx.addMode(Mode.Printing)
-  protected[this] def printDebug = ctx.settings.YprintDebug.value
+  protected implicit def ctx: Context = _ctx.addMode(Mode.Printing)
+  protected def printDebug = ctx.settings.YprintDebug.value
 
   private[this] var openRecs: List[RecType] = Nil
 

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

@@ -35,7 +35,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
   private[this] var printPos = ctx.settings.YprintPos.value
   private[this] val printLines = ctx.settings.printLines.value
 
-  override protected[this] implicit def ctx: Context = myCtx
+  override protected implicit def ctx: Context = myCtx
 
   def withEnclosingDef(enclDef: Tree[? >: Untyped])(op: => Text): Text = {
     val savedCtx = myCtx

compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala

@@ -20,7 +20,7 @@ import diagnostic.messages._
   */
 class StoreReporter(outer: Reporter) extends Reporter {
 
-  protected[this] var infos: mutable.ListBuffer[MessageContainer] = null
+  protected var infos: mutable.ListBuffer[MessageContainer] = null
 
   def doReport(m: MessageContainer)(implicit ctx: Context): Unit = {
     typr.println(s">>>> StoredError: ${m.message}") // !!! DEBUG

compiler/src/dotty/tools/repl/ReplCompiler.scala

@@ -41,7 +41,7 @@ class ReplCompiler extends Compiler {
   def newRun(initCtx: Context, state: State): Run = new Run(this, initCtx) {
 
     /** Import previous runs and user defined imports */
-    override protected[this] def rootContext(implicit ctx: Context): Context = {
+    override protected def rootContext(implicit ctx: Context): Context = {
       def importContext(imp: tpd.Import)(implicit ctx: Context) =
         ctx.importContext(imp, imp.symbol)
 

compiler/src/dotty/tools/repl/ReplDriver.scala

@@ -78,7 +78,7 @@ class ReplDriver(settings: Array[String],
    *  such, when the user enters `:reset` this method should be called to reset
    *  everything properly
    */
-  protected[this] def resetToInitial(): Unit = {
+  protected def resetToInitial(): Unit = {
     rootCtx = initialCtx
     if (rootCtx.settings.outputDir.isDefault(rootCtx))
       rootCtx = rootCtx.fresh
@@ -159,7 +159,7 @@ class ReplDriver(settings: Array[String],
   }
 
   /** Extract possible completions at the index of `cursor` in `expr` */
-  protected[this] final def completions(cursor: Int, expr: String, state0: State): List[Candidate] = {
+  protected final def completions(cursor: Int, expr: String, state0: State): List[Candidate] = {
     def makeCandidate(completion: Completion) = {
       val displ = completion.label
       new Candidate(

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

@@ -351,7 +351,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     private[this] var _failureCount = 0
 
     /** Fail the current test */
-    protected[this] final def fail(failure: Failure = Generic): Unit = synchronized {
+    protected final def fail(failure: Failure = Generic): Unit = synchronized {
       _failures = _failures + failure
       _failureCount = _failureCount + 1
     }