From c81a21a8ecc690813bbe4eaece0640f262434f84 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 3 Jan 2014 15:27:28 +0100 Subject: Don't print module class suffix in refined printer. --- src/dotty/tools/dotc/printing/RefinedPrinter.scala | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/dotty/tools/dotc/printing/RefinedPrinter.scala b/src/dotty/tools/dotc/printing/RefinedPrinter.scala index 52006bd74..cda753d3a 100644 --- a/src/dotty/tools/dotc/printing/RefinedPrinter.scala +++ b/src/dotty/tools/dotc/printing/RefinedPrinter.scala @@ -33,11 +33,8 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) { override def nameString(name: Name): String = name.decode.toString - override protected def simpleNameString(sym: Symbol): String = { - var name = sym.originalName - //if (sym is ModuleClass) name = name.stripModuleClassSuffix - name.decode.toString - } + override protected def simpleNameString(sym: Symbol): String = + sym.originalName.decode.toString override protected def fullNameOwner(sym: Symbol) = { val owner = super.fullNameOwner(sym) @@ -94,7 +91,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) { tp match { case tp: RefinedType => val args = tp.typeArgs - if (args.nonEmpty) { + if (args.nonEmpty && (args forall (_.exists))) { val tycon = tp.unrefine val cls = tycon.typeSymbol if (cls.typeParams.length == args.length) { -- cgit v1.2.3