diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-09-02 14:44:56 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-09-23 15:43:50 +1000 |
commit | 9f8961c58a01e83cf4bc782ac03dd9919983ce30 (patch) | |
tree | 07e7cea7780ddf2583b89db2440e488974a6c609 /src/repl/scala/tools/nsc/interpreter/Completion.scala | |
parent | df704ef7389ff6265afc1278783489ee97ee4ce7 (diff) | |
download | scala-9f8961c58a01e83cf4bc782ac03dd9919983ce30.tar.gz scala-9f8961c58a01e83cf4bc782ac03dd9919983ce30.tar.bz2 scala-9f8961c58a01e83cf4bc782ac03dd9919983ce30.zip |
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.
Diffstat (limited to 'src/repl/scala/tools/nsc/interpreter/Completion.scala')
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/Completion.scala | 17 |
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) - } - } } |