14 files changed, 29 insertions, 25 deletions

diff --git a/src/dotty/tools/dotc/core/Constants.scala b/src/dotty/tools/dotc/core/Constants.scala
index 0b4f51cf2..cdfb62a18 100644
--- a/src/dotty/tools/dotc/core/Constants.scala
+++ b/src/dotty/tools/dotc/core/Constants.scala
@@ -21,7 +21,7 @@ object Constants {
   // For supporting java enumerations inside java annotations (see ClassfileParser)
   final val EnumTag    = 13
 
-  case class Constant(value: Any) extends Showable {
+  case class Constant(value: Any) extends printing.Showable {
     import java.lang.Double.doubleToRawLongBits
     import java.lang.Float.floatToRawIntBits
 
diff --git a/src/dotty/tools/dotc/core/Contexts.scala b/src/dotty/tools/dotc/core/Contexts.scala
index 3eb0f573a..e6bd5a843 100644
--- a/src/dotty/tools/dotc/core/Contexts.scala
+++ b/src/dotty/tools/dotc/core/Contexts.scala
@@ -8,7 +8,7 @@ import Names._
 import Phases._
 import Types._
 import Symbols._
-import TypeComparers._, Printers._, NameOps._, SymDenotations._, util.Positions._
+import TypeComparers._, printing.Printers._, NameOps._, SymDenotations._, util.Positions._
 import TypedTrees.tpd._, util.FreshNameCreator
 import config.Settings._
 import config.ScalaSettings
@@ -43,7 +43,7 @@ object Contexts {
                             with Substituters
                             with TypeOps
                             with Phases
-                            with Printers
+                            with printing.Printers
                             with Symbols
                             with SymDenotations
                             with Reporting
@@ -367,7 +367,7 @@ object Contexts {
 
     // Printers state
     /** Number of recursive invocations of a show method on cuyrrent stack */
-    private[core] var toTextRecursions = 0
+    private[dotc] var toTextRecursions = 0
 
     // Reporters state
     private[dotc] var indent = 0
diff --git a/src/dotty/tools/dotc/core/Decorators.scala b/src/dotty/tools/dotc/core/Decorators.scala
index 2d6526c26..2f91aa59a 100644
--- a/src/dotty/tools/dotc/core/Decorators.scala
+++ b/src/dotty/tools/dotc/core/Decorators.scala
@@ -3,7 +3,7 @@ package core
 
 import annotation.tailrec
 import Symbols._
-import Contexts._, Names._, Phases._, util.Texts._
+import Contexts._, Names._, Phases._, printing.Texts._
 
 /** This object provides useful implicit decorators for types defined elsewhere */
 object Decorators {
diff --git a/src/dotty/tools/dotc/core/Denotations.scala b/src/dotty/tools/dotc/core/Denotations.scala
index 66baeef55..e30e230b1 100644
--- a/src/dotty/tools/dotc/core/Denotations.scala
+++ b/src/dotty/tools/dotc/core/Denotations.scala
@@ -9,7 +9,7 @@ import Names.TypeName
 import Symbols.NoSymbol
 import Symbols._
 import Types._, Periods._, Flags._, Transformers._
-import util.Texts._
+import printing.Texts._
 import io.AbstractFile
 import Decorators.SymbolIteratorDecorator
 
@@ -109,7 +109,7 @@ object Denotations {
    *
    *  Then the denotation of `y` is `SingleDenotation(NoSymbol, A | B)`.
    */
-  abstract class Denotation extends DotClass with Showable {
+  abstract class Denotation extends DotClass with printing.Showable {
 
     /** The referencing symbol, exists only for non-overloaded denotations */
     def symbol: Symbol
diff --git a/src/dotty/tools/dotc/core/Scopes.scala b/src/dotty/tools/dotc/core/Scopes.scala
index 6bcfc6f6a..426d5a51a 100644
--- a/src/dotty/tools/dotc/core/Scopes.scala
+++ b/src/dotty/tools/dotc/core/Scopes.scala
@@ -12,7 +12,7 @@ import Periods._
 import Decorators._
 import Contexts._
 import Denotations._
-import util.Texts._
+import printing.Texts._
 import SymDenotations.NoDenotation
 
 object Scopes {
@@ -49,7 +49,7 @@ object Scopes {
    *  or to delete them. These methods are provided by subclass
    *  MutableScope.
    */
-  abstract class Scope extends Showable with Iterable[Symbol] {
+  abstract class Scope extends printing.Showable with Iterable[Symbol] {
 
     /** The last scope-entry from which all others are reachable via `prev` */
     private[dotc] def lastEntry: ScopeEntry
diff --git a/src/dotty/tools/dotc/core/Symbols.scala b/src/dotty/tools/dotc/core/Symbols.scala
index 9d1545371..7d9fa9d44 100644
--- a/src/dotty/tools/dotc/core/Symbols.scala
+++ b/src/dotty/tools/dotc/core/Symbols.scala
@@ -10,7 +10,7 @@ import java.lang.AssertionError
 import Decorators._
 import Symbols._
 import Contexts._
-import SymDenotations._, util.Texts._
+import SymDenotations._, printing.Texts._
 import Types._, Annotations._, util.Positions._, StdNames._, Trees._, NameOps._
 import Denotations.{ Denotation, SingleDenotation, MultiDenotation }
 import collection.mutable
@@ -287,7 +287,7 @@ object Symbols {
 
   /** A Symbol represents a Scala definition/declaration or a package.
    */
-  class Symbol private[Symbols] (val coord: Coord) extends DotClass with Showable {
+  class Symbol private[Symbols] (val coord: Coord) extends DotClass with printing.Showable {
 
     type ThisName <: Name
 
diff --git a/src/dotty/tools/dotc/core/Trees.scala b/src/dotty/tools/dotc/core/Trees.scala
index 054b17fa9..f99e72196 100644
--- a/src/dotty/tools/dotc/core/Trees.scala
+++ b/src/dotty/tools/dotc/core/Trees.scala
@@ -135,7 +135,7 @@ object Trees {
    *   - Type checking an untyped tree should remove all embedded `TypedSplice`
    *     nodes.
    */
-  abstract class Tree[T >: Untyped] extends Positioned with Product with Showable with Cloneable {
+  abstract class Tree[T >: Untyped] extends Positioned with Product with printing.Showable with Cloneable {
 
     if (Stats.enabled) ntrees += 1
 
diff --git a/src/dotty/tools/dotc/core/Types.scala b/src/dotty/tools/dotc/core/Types.scala
index e4209ba98..46b718968 100644
--- a/src/dotty/tools/dotc/core/Types.scala
+++ b/src/dotty/tools/dotc/core/Types.scala
@@ -15,7 +15,7 @@ import SymDenotations._
 import Decorators._
 import Denotations._
 import Periods._
-import TypedTrees.tpd._, TypedTrees.TreeMapper, util.Texts._
+import TypedTrees.tpd._, TypedTrees.TreeMapper, printing.Texts._
 import transform.Erasure
 import scala.util.hashing.{ MurmurHash3 => hashing }
 import collection.mutable
@@ -70,7 +70,7 @@ object Types {
    *                       +- ErrorType
    *                       +- WildcardType
    */
-  abstract class Type extends DotClass with Showable {
+  abstract class Type extends DotClass with printing.Showable {
 
 // ----- Tests -----------------------------------------------------
 
@@ -735,7 +735,7 @@ object Types {
      */
     def signature(implicit ctx: Context): Signature = NotAMethod
 
-    def toText(implicit ctx: Context): Text = ctx.toText(this, Printers.GlobalPrec)
+    def toText(implicit ctx: Context): Text = ctx.toText(this, printing.Printers.GlobalPrec)
 
 // ----- hashing ------------------------------------------------------
 
diff --git a/src/dotty/tools/dotc/core/pickling/UnPickler.scala b/src/dotty/tools/dotc/core/pickling/UnPickler.scala
index 55c086e6f..1c9ce4b8a 100644
--- a/src/dotty/tools/dotc/core/pickling/UnPickler.scala
+++ b/src/dotty/tools/dotc/core/pickling/UnPickler.scala
@@ -10,7 +10,7 @@ import java.lang.Double.longBitsToDouble
 import Contexts._, Symbols._, Types._, Scopes._, SymDenotations._, Names._, NameOps._
 import StdNames._, Denotations._, NameOps._, Flags._, Constants._, Annotations._
 import util.Positions._, TypedTrees.tpd._, TypedTrees.TreeOps
-import util.Texts._
+import printing.Texts._
 import io.AbstractFile
 import scala.reflect.internal.pickling.PickleFormat._
 import Decorators._
diff --git a/src/dotty/tools/dotc/core/Printers.scala b/src/dotty/tools/dotc/printing/Printers.scala
index 51cb01e02..6a2f98250 100644
--- a/src/dotty/tools/dotc/core/Printers.scala
+++ b/src/dotty/tools/dotc/printing/Printers.scala
@@ -1,9 +1,10 @@
 package dotty.tools.dotc
-package core
+package printing
 
+import core._
 import Types._, Symbols._, Contexts._, Scopes._, Names._, NameOps._, Flags._
 import Constants._, Annotations._, StdNames._, Denotations._, SymDenotations._, Trees._
-import util.Texts._
+import Texts._
 import java.lang.Integer.toOctalString
 import scala.annotation.switch
 
@@ -493,6 +494,8 @@ object Printers {
       super.toText(tp, prec)
     }
 
+    override def toText[T >: Untyped](tree: Tree[T]): Text = super.toText(tree)
+
     override protected def polyParamName(name: TypeName): TypeName =
       name.unexpandedName()
 
diff --git a/src/dotty/tools/dotc/core/Showable.scala b/src/dotty/tools/dotc/printing/Showable.scala
index 54a25506a..73d320019 100644
--- a/src/dotty/tools/dotc/core/Showable.scala
+++ b/src/dotty/tools/dotc/printing/Showable.scala
@@ -1,7 +1,9 @@
 package dotty.tools.dotc
-package core
+package printing
 
-import Contexts._, util.Texts._, Decorators._
+import core._
+
+import Contexts._, Texts._, Decorators._
 
 trait Showable {
 
diff --git a/src/dotty/tools/dotc/util/Text.scala b/src/dotty/tools/dotc/printing/Texts.scala
index a314e8ab4..2ff4edc9a 100644
--- a/src/dotty/tools/dotc/util/Text.scala
+++ b/src/dotty/tools/dotc/printing/Texts.scala
@@ -1,6 +1,5 @@
-package dotty.tools.dotc.util
-
-import language.implicitConversions
+package dotty.tools.dotc
+package printing
 
 object Texts {
 
diff --git a/test/test/DottyTest.scala b/test/test/DottyTest.scala
index 28bc59b28..2d9397fa6 100644
--- a/test/test/DottyTest.scala
+++ b/test/test/DottyTest.scala
@@ -5,7 +5,7 @@ import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Flags._
 import Types._, Symbols._, Decorators._
-import dotty.tools.dotc.util.Texts._
+import dotty.tools.dotc.printing.Texts._
 import dotty.tools.dotc.core.Decorators._
 import org.junit.Test
 
diff --git a/test/test/ShowClassTests.scala b/test/test/ShowClassTests.scala
index 391019114..195304ed6 100644
--- a/test/test/ShowClassTests.scala
+++ b/test/test/ShowClassTests.scala
@@ -5,7 +5,7 @@ import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.Types._
-import dotty.tools.dotc.util.Texts._
+import dotty.tools.dotc.printing.Texts._
 import NameOps._
 import dotty.tools.dotc.core.Decorators._
 import org.junit.Test