More This renamings in compiler

Author: odersky

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

@@ -1328,7 +1328,7 @@ object SymDenotations {
     /** The type parameters of a class symbol, Nil for all other symbols */
     def typeParams(implicit ctx: Context): List[TypeSymbol] = Nil
 
-    /** The type This(cls), where cls is this class, NoPrefix for all other symbols */
+    /** The type ThisType(cls), where cls is this class, NoPrefix for all other symbols */
     def thisType(implicit ctx: Context): Type = NoPrefix
 
     def typeRef(implicit ctx: Context): TypeRef =

compiler/src/dotty/tools/dotc/util/WeakHashSet.scala

@@ -23,7 +23,7 @@ final class WeakHashSet[A <: AnyRef](initialCapacity: Int, loadFactor: Double) e
 
   def this() = this(initialCapacity = WeakHashSet.defaultInitialCapacity, loadFactor = WeakHashSet.defaultLoadFactor)
 
-  type This = WeakHashSet[A]
+  type ThisType = WeakHashSet[A]
 
   /**
    * queue of Entries that hold elements scheduled for GC
@@ -252,7 +252,7 @@ final class WeakHashSet[A <: AnyRef](initialCapacity: Int, loadFactor: Double) e
   }
 
   // true if this set is empty
-  override def empty: This = new WeakHashSet[A](initialCapacity, loadFactor)
+  override def empty: ThisType = new WeakHashSet[A](initialCapacity, loadFactor)
 
   // the number of elements in this set
   override def size: Int = {

compiler/test/dotty/tools/dotc/parsing/parsePackage.scala

@@ -19,8 +19,8 @@ object parsePackage extends ParserTest {
       tree match {
         case Ident(name) =>
           Ident(name)
-        case This(name) =>
-          This(name)
+        case ThisRef(name) =>
+          ThisRef(name)
         case TypedSplice(t) =>
           TypedSplice(t)
         case SymbolLit(str) =>