Disable enclding in retyping.

We would like to be able to define unencoded symbolic names in trees computed by the compiler.
The patch avoids their accidental encoding.

2 files changed, 6 insertions, 2 deletions

diff --git a/src/dotty/tools/dotc/typer/ReTyper.scala b/src/dotty/tools/dotc/typer/ReTyper.scala
index b36c8eafe..230788cc1 100644
--- a/src/dotty/tools/dotc/typer/ReTyper.scala
+++ b/src/dotty/tools/dotc/typer/ReTyper.scala
@@ -30,7 +30,7 @@ class ReTyper extends Typer {
     promote(tree)
 
   override def typedSelect(tree: untpd.Select, pt: Type)(implicit ctx: Context): Tree = {
-    assert(tree.hasType)
+    assert(tree.hasType, tree)
     val qual1 = typed(tree.qualifier, AnySelectionProto)
     untpd.cpy.Select(tree)(qual1, tree.name).withType(tree.typeOpt)
   }
@@ -68,5 +68,7 @@ class ReTyper extends Typer {
   override def addTypedModifiersAnnotations(mods: untpd.Modifiers, sym: Symbol)(implicit ctx: Context): Modifiers =
     typedModifiers(mods, sym)
 
+  override def encodeName(tree: untpd.NameTree)(implicit ctx: Context) = tree
+
   override def checkVariance(tree: Tree)(implicit ctx: Context) = ()
 }
\ No newline at end of file
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala
index 9bf4d8a66..89cf0b055 100644
--- a/src/dotty/tools/dotc/typer/Typer.scala
+++ b/src/dotty/tools/dotc/typer/Typer.scala
@@ -996,13 +996,15 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
         }
 
         xtree match {
-          case xtree: untpd.NameTree => typedNamed(xtree withName xtree.name.encode, pt)
+          case xtree: untpd.NameTree => typedNamed(encodeName(xtree), pt)
           case xtree: untpd.Import => typedImport(xtree, retrieveSym(xtree))
           case xtree => typedUnnamed(xtree)
         }
     }
   }
 
+  protected def encodeName(tree: untpd.NameTree)(implicit ctx: Context) = tree withName tree.name.encode
+
   def typed(tree: untpd.Tree, pt: Type = WildcardType)(implicit ctx: Context): Tree = /*>|>*/ ctx.traceIndented (i"typing $tree", typr, show = true) /*<|<*/ {
     assertPositioned(tree)
     try adapt(typedUnadapted(tree, pt), pt, tree)