Remove more duplication from UserFacingPrinter

Author: felixmulder

repl/src/dotty/tools/repl/ReplDriver.scala

@@ -49,8 +49,9 @@ import results._
  *  @param valIndex the index of next value binding for free expressions
  *  @param history a list of user inputs as strings
  *  @param imports a list of tuples of imports on tree form and shown form
- *  @param run TODO
- *
+ *  @param run the latest run initiated at the start of interpretation. This
+ *             run and its context should be used in order to perform any
+ *             manipulation on `Tree`s and `Symbol`s.
  */
 case class State(objectIndex: Int,
                  valIndex: Int,
@@ -70,7 +71,6 @@ case class State(objectIndex: Int,
  *
  *  @param cursor the index of the users cursor in the input
  *  @param suggestions the suggested completions as a filtered list of strings
- *  @param details should be a list of signatures for the suggestions, TODO
  */
 case class Completions(cursor: Int,
                        suggestions: List[String],

repl/src/dotty/tools/repl/UserFacingPrinter.scala

@@ -40,23 +40,15 @@ class UserFacingPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       pkgSym.name.isReplWrapperName
   }
 
-  // FIXME
-  override def kindString(sym: Symbol): String = {
+  override protected def keyString(sym: Symbol): String = {
     val flags = sym.flags
     if (flags is Package) ""
     else if (sym.isPackageObject) "package object"
     else if (flags.is(Module) && flags.is(Case)) "case object"
-    else if (flags is Module) "object"
-    else if (flags is ImplClass) "class"
-    else if (flags.is(Trait)) "trait"
     else if (sym.isClass && flags.is(Case)) "case class"
-    else if (sym.isClass) "class"
-    else if (sym.isType) "type"
     else if (flags.is(Lazy)) "lazy val"
-    else if (flags.is(Mutable)) "var"
-    else if (sym.is(Method)) "def"
-    else if (sym.isTerm) "val"
-    else super.kindString(sym)
+    else if (flags is Module) "object"
+    else super.keyString(sym)
   }
 
   override def nameString(name: Name): String =
@@ -65,7 +57,7 @@ class UserFacingPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
 
   override def toText(sym: Symbol): Text =
     if (sym.name.isReplAssignName) nameString(sym.name)
-    else kindString(sym) ~~ nameString(sym.name.stripModuleClassSuffix)
+    else keyString(sym) ~~ nameString(sym.name.stripModuleClassSuffix)
 
   override def dclText(sym: Symbol): Text =
     toText(sym) ~ {