reorder

Author: retronym

src/compiler/scala/tools/nsc/transform/Rewrites.scala

@@ -174,6 +174,37 @@ abstract class Rewrites extends SubComponent with TypingTransformers {
     }
   }
 
+  private class TypeRenderer(rewriteTransformer: RewriteTypingTransformer) extends TypeMap {
+    override def apply(tp: Type): Type = tp match {
+      case SingleType(pre, sym) if tp.prefix.typeSymbol.isOmittablePrefix =>
+        adjust(tp, pre, sym, Mode.QUALmode)((pre1, sym1) => SingleType(pre1, sym1))
+      case TypeRef(pre, sym, args) =>
+        val args1 = args.mapConserve(this)
+        adjust(tp, pre, sym, Mode.TAPPmode | Mode.FUNmode)((pre1, sym1) => TypeRef(pre1, sym1, args1))
+      case _ =>
+        mapOver(tp)
+    }
+
+    def adjust(tp: Type, pre: Type, sym: Symbol, mode: Mode)(f: (Type, Symbol) => Type): Type = {
+      if (pre.typeSymbol.isOmittablePrefix || global.shorthands.contains(sym.fullName)) {
+        val typedTree = rewriteTransformer.silentTyped(Ident(sym.name), mode)
+        if (typedTree.symbol == sym || sym.tpeHK =:= typedTree.tpe)
+          f(NoPrefix, sym)
+        else {
+          val dummyOwner = NoSymbol.newClassSymbol(TypeName(pre.typeSymbol.fullName))
+          dummyOwner.setInfo(ThisType(dummyOwner))
+          val pre1 = pre match {
+            case ThisType(_) | SingleType(_, _) => SingleType(NoPrefix, dummyOwner)
+            case _ => TypeRef(NoPrefix, dummyOwner, Nil)
+          }
+          f(pre1, sym.cloneSymbol(NoSymbol))
+        }
+      } else {
+        mapOver(tp)
+      }
+    }
+  }
+
   // Rewrites
 
   private object BreakoutTraverser {
@@ -237,34 +268,4 @@ abstract class Rewrites extends SubComponent with TypingTransformers {
       super.transform(tree)
     }
   }
-  private class TypeRenderer(rewriteTransformer: RewriteTypingTransformer) extends TypeMap {
-    override def apply(tp: Type): Type = tp match {
-      case SingleType(pre, sym) if tp.prefix.typeSymbol.isOmittablePrefix =>
-        adjust(tp, pre, sym, Mode.QUALmode)((pre1, sym1) => SingleType(pre1, sym1))
-      case TypeRef(pre, sym, args) =>
-        val args1 = args.mapConserve(this)
-        adjust(tp, pre, sym, Mode.TAPPmode | Mode.FUNmode)((pre1, sym1) => TypeRef(pre1, sym1, args1))
-      case _ =>
-        mapOver(tp)
-    }
-
-    def adjust(tp: Type, pre: Type, sym: Symbol, mode: Mode)(f: (Type, Symbol) => Type): Type = {
-      if (pre.typeSymbol.isOmittablePrefix || global.shorthands.contains(sym.fullName)) {
-        val typedTree = rewriteTransformer.silentTyped(Ident(sym.name), mode)
-        if (typedTree.symbol == sym || sym.tpeHK =:= typedTree.tpe)
-          f(NoPrefix, sym)
-        else {
-          val dummyOwner = NoSymbol.newClassSymbol(TypeName(pre.typeSymbol.fullName))
-          dummyOwner.setInfo(ThisType(dummyOwner))
-          val pre1 = pre match {
-            case ThisType(_) | SingleType(_, _) => SingleType(NoPrefix, dummyOwner)
-            case _ => TypeRef(NoPrefix, dummyOwner, Nil)
-          }
-          f(pre1, sym.cloneSymbol(NoSymbol))
-        }
-      } else {
-        mapOver(tp)
-      }
-    }
-  }
 }