From 39a858de7a65b70ae35ce460e7746cae5e4d3fc4 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Wed, 10 Feb 2016 12:26:41 +1000 Subject: Fix SBT tab completion of scala command `scala -deprecation` (without a trailing script argument) wasn't allowed. Now it is. I also supported trailing whitespace on all commands. Also fixed: a bug with completion of `scalac ./san`. It was completing as though the `./` had not been typed, which threw the suggestion off by a few characters. --- project/ScalaOptionParser.scala | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'project/ScalaOptionParser.scala') diff --git a/project/ScalaOptionParser.scala b/project/ScalaOptionParser.scala index a11bd93d82..da8a3bf460 100644 --- a/project/ScalaOptionParser.scala +++ b/project/ScalaOptionParser.scala @@ -63,19 +63,20 @@ object ScalaOptionParser { ++ scaladocPathSettingNames.map(PathSetting) ++ scaladocMultiStringSettingNames.map(MultiStringSetting) ) - val ScalaDocOpt = sourceFile | ScalaOpt | ScalaDocExtraSettings + val ScalaDocOpt = ScalacOpt | ScalaDocExtraSettings - entryPoint match { + val P = entryPoint match { case "scala" => val runnable = token(StringBasicNotStartingWithDash, TokenCompletions.displayOnly("")).filter(!_.startsWith("-"), x => x) val runnableAndArgs = concat(runnable ~ Opt(concat(Space.string ~ repsep(token(StringBasic, TokenCompletions.displayOnly("")), Space).map(_.mkString(" "))))) - val options = repsep(ScalaOpt, Space).map(_.mkString(" ")) - Opt(Space ~> EitherOr(options, runnableAndArgs)) + val options = rep1sep(ScalaOpt, Space).map(_.mkString(" ")) + Opt(Space ~> (options | concat(concat(options ~ Space.string) ~ runnableAndArgs) | runnableAndArgs)) case "scaladoc" => Opt(Space ~> Opt(repsep(ScalaDocOpt, Space).map(_.mkString(" ")))) case "scalac" => Opt(Space ~> repsep(ScalacOpt, Space).map(_.mkString(" "))) } + P <~ token(OptSpace) } // TODO retrieve this data programatically, ala https://github.com/scala/scala-tool-support/blob/master/bash-completion/src/main/scala/BashCompletion.scala -- cgit v1.2.3