Remove the old REPL tab completion implementation

We kept it around behind an option in 2.11.x, but we can
jettison it in 2.12.x.

1 files changed, 2 insertions, 15 deletions

diff --git a/src/repl/scala/tools/nsc/interpreter/Completion.scala b/src/repl/scala/tools/nsc/interpreter/Completion.scala
index 9ad7f95fae..3d0b9a975c 100644
--- a/src/repl/scala/tools/nsc/interpreter/Completion.scala
+++ b/src/repl/scala/tools/nsc/interpreter/Completion.scala
@@ -13,24 +13,17 @@ import Completion._
  */
 trait Completion {
   def resetVerbosity(): Unit
-  def completer(): ScalaCompleter
+  def complete(buffer: String, cursor: Int): Candidates
 }
 object NoCompletion extends Completion {
   def resetVerbosity() = ()
-  def completer() = NullCompleter
+  def complete(buffer: String, cursor: Int) = NoCandidates
 }
 
 object Completion {
   case class Candidates(cursor: Int, candidates: List[String]) { }
   val NoCandidates = Candidates(-1, Nil)
 
-  object NullCompleter extends ScalaCompleter {
-    def complete(buffer: String, cursor: Int): Candidates = NoCandidates
-  }
-  trait ScalaCompleter {
-    def complete(buffer: String, cursor: Int): Candidates
-  }
-
   def looksLikeInvocation(code: String) = (
         (code != null)
     &&  (code startsWith ".")
@@ -38,10 +31,4 @@ object Completion {
     && !(code startsWith "./")
     && !(code startsWith "..")
   )
-  object Forwarder {
-    def apply(forwardTo: () => Option[CompletionAware]): CompletionAware = new CompletionAware {
-      def completions(verbosity: Int) = forwardTo() map (_ completions verbosity) getOrElse Nil
-      override def follow(s: String) = forwardTo() flatMap (_ follow s)
-    }
-  }
 }