luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lazier completions

This commit is contained in:
Mark Harrah 2010-03-13 13:44:29 -05:00
parent 9afe207993
commit 7e541dde31
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/scala/sbt/LineReader.scala
View File

@ -7,11 +7,16 @@ trait LineReader extends NotNull
{
def readLine(prompt: String): Option[String]
}
class Completors(val projectAction: String, val projectNames: Iterable[String],
class Completors(val projectAction: String, projectNames0: => Iterable[String],
val generalCommands: Iterable[String], val propertyActions: Iterable[String],
val specificPrefix: String, val scalaVersions: Iterable[String],
val specificPrefix: String, scalaVersions0: => Iterable[String],
val prefixes: Iterable[String], val taskNames: Iterable[String],
val propertyNames: Iterable[String], val extra: ExtraCompletions) extends NotNull
propertyNames0: => Iterable[String], val extra: ExtraCompletions) extends NotNull
{
lazy val scalaVersions = scalaVersions0
lazy val propertyNames = propertyNames0
lazy val projectNames = projectNames0
}
trait ExtraCompletions extends NotNull
{
@ -96,16 +101,17 @@ object MainCompletor
def specificCompletor(baseCompletor: Completor) =
{
val specific = simpleCompletor(specificPrefix :: Nil) // TODO
new ArgumentCompletor( Array( specific, simpleCompletor(scalaVersions), baseCompletor ) )
argumentCompletor( Array( specific, lazySimpleCompletor(scalaVersions), baseCompletor ) )
}
def extraCompletor(name: String) =
repeatedArgumentCompletor(simpleCompletor(name :: Nil), new LazyCompletor(simpleCompletor(extra.completions(name))))
repeatedArgumentCompletor(simpleCompletor(name :: Nil), lazySimpleCompletor(extra.completions(name)))
val taskCompletor = simpleCompletor(TreeSet(taskNames.toSeq : _*))
val extraCompletors = extra.names.map(extraCompletor)
val baseCompletors = generalCompletor :: taskCompletor :: projectCompletor :: propertyCompletor(propertyNames) :: extraCompletors.toList
val baseCompletors = generalCompletor :: projectCompletor :: taskCompletor :: propertyCompletor(propertyNames) :: extraCompletors.toList
val baseCompletor = new MultiCompletor(baseCompletors.toArray)
val completor = new MultiCompletor()
//TODO: baseCompletor for prefixedCompletor should only be taskCompletor ++ extraCompletors
completor.setCompletors( Array(baseCompletor, prefixedCompletor(baseCompletor), specificCompletor(baseCompletor)) )
completor
}
@ -116,22 +122,19 @@ object MainCompletor
(buffer.charAt(pos) == ' ') && buffer.substring(0, pos).trim.indexOf(' ') == -1
}
private def lazySimpleCompletor(completions: => Iterable[String]) = new LazyCompletor(simpleCompletor(completions))
private def simpleCompletor(completions: Iterable[String]) = new SimpleCompletor(completions.toList.toArray)
private def simpleArgumentCompletor(first: Iterable[String], second: Iterable[String]) =
singleArgumentCompletor(simpleCompletor(first), simpleCompletor(second))
private def simpleArgumentCompletor(first: Iterable[String], second: => Iterable[String]) =
singleArgumentCompletor(simpleCompletor(first), lazySimpleCompletor(second))
private def singleArgumentCompletor(first: Completor, second: Completor) =
{
val completors = Array(first, second, new NullCompletor)
val c = new ArgumentCompletor(completors, SingleArgumentDelimiter)
c.setStrict(true)
c
}
private def repeatedArgumentCompletor(first: Completor, repeat: Completor) =
{
val c = new ArgumentCompletor(Array(first, repeat))
c.setStrict(true)
c
strict( new ArgumentCompletor(completors, SingleArgumentDelimiter) )
}
private def repeatedArgumentCompletor(first: Completor, repeat: Completor) = argumentCompletor(Array(first, repeat))
private def argumentCompletor(args: Array[Completor]) = strict(new ArgumentCompletor(args))
private def strict(c: ArgumentCompletor) = { c.setStrict(true); c }
}
private class LazyCompletor(delegate0: => Completor) extends Completor
{

4
src/main/scala/sbt/Main.scala
View File

@ -325,9 +325,9 @@ class xMain extends xsbti.AppMain
None
}
}
// todo: project.log.info("No actions specified, interactive session started. Execute 'help' for more information.")
private def prompt(baseProject: Project, project: Project): String =
{
// the times for evaluating the lazy vals here are a few hundred ms out of a 2s startup
lazy val projectNames = baseProject.projectClosure.map(_.name)
val prefixes = ContinuousExecutePrefix :: CrossBuildPrefix :: Nil
lazy val scalaVersions = baseProject.crossScalaVersions ++ Seq(baseProject.defScalaVersion.value)
@ -439,7 +439,7 @@ class xMain extends xsbti.AppMain
printCmd(TerminateActions.elements.mkString(", "), "Terminates the build.")
printCmd(SetAction + " <property> <value>", "Sets the value of the property given as its argument.")
printCmd(GetAction + " <property>", "Gets the value of the property given as its argument.")
printCmd(ProjectConsoleAction, "Enters the Scala interpreter with the current project bound to the variable 'current' and all members imported.")
printCmd(ProjectConsoleAction, "Enters the Scala interpreter with the current project definition bound to the variable 'current' and all members imported.")
if(!isInteractive)
printCmd(InteractiveCommand, "Enters the sbt interactive shell")
}