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

Speed up startup by delaying initialization of tab completion

This commit is contained in:
Mark Harrah 2010-02-04 22:50:56 -05:00
parent 7119c1adbe
commit 04c73ab1f0
2 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,8 +10,10 @@ trait LineReader extends NotNull
class Completors(val projectAction: String, val projectNames: Iterable[String], class Completors(val projectAction: String, val projectNames: Iterable[String],
val generalCommands: Iterable[String], val propertyActions: Iterable[String], val generalCommands: Iterable[String], val propertyActions: Iterable[String],
val specificPrefix: String, val scalaVersions: Iterable[String], val specificPrefix: String, val scalaVersions: Iterable[String],
val prefixes: Iterable[String]) extends NotNull val prefixes: Iterable[String], val taskNames: Iterable[String],
import jline.ConsoleReader val propertyNames: Iterable[String], val extra: Iterable[(String, Iterable[String])]) extends NotNull
import jline.{Completor, ConsoleReader}
abstract class JLine extends LineReader abstract class JLine extends LineReader
{ {
protected[this] val reader: ConsoleReader protected[this] val reader: ConsoleReader
@ -49,16 +51,8 @@ object SimpleReader extends JLine
{ {
protected[this] val reader = JLine.createReader() protected[this] val reader = JLine.createReader()
} }
class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger) extends JLine private[sbt] final class LazyJLineReader(historyPath: Option[Path], completor: => Completor, log: Logger) extends JLine
{ {
import completors._
import jline.{ArgumentCompletor, Completor, MultiCompletor, NullCompletor, SimpleCompletor}
private val generalCompletor = simpleCompletor(generalCommands)
private val projectCompletor = simpleArgumentCompletor(projectAction :: Nil, projectNames)
private val completor = new MultiCompletor()
protected[this] val reader = protected[this] val reader =
{ {
val cr = new ConsoleReader val cr = new ConsoleReader
@ -72,10 +66,40 @@ class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger
cr.getHistory.setHistoryFile(historyFile) cr.getHistory.setHistoryFile(historyFile)
} }
} }
cr.addCompletor(completor) cr.addCompletor(new LazyCompletor(completor))
cr cr
} }
}
object MainCompletor
{
import jline.{ArgumentCompletor, MultiCompletor, NullCompletor, SimpleCompletor}
def apply(completors: Completors): Completor =
{
import completors._
import scala.collection.immutable.TreeSet
val generalCompletor = simpleCompletor(generalCommands)
val projectCompletor = simpleArgumentCompletor(projectAction :: Nil, projectNames)
def propertyCompletor(propertyNames: Iterable[String]) =
simpleArgumentCompletor(propertyActions, propertyNames)
def prefixedCompletor(baseCompletor: Completor) =
singleArgumentCompletor(simpleCompletor(prefixes), baseCompletor)
def specificCompletor(baseCompletor: Completor) =
{
val specific = simpleCompletor(specificPrefix :: Nil) // TODO
new ArgumentCompletor( Array( specific, simpleCompletor(scalaVersions), baseCompletor ) )
}
val taskCompletor = simpleCompletor(TreeSet(taskNames.toSeq : _*))
val extraCompletors = for( (first, repeat) <- extra) yield repeatedArgumentCompletor(simpleCompletor(first :: Nil), simpleCompletor(repeat))
val baseCompletors = generalCompletor :: taskCompletor :: projectCompletor :: propertyCompletor(propertyNames) :: extraCompletors.toList
val baseCompletor = new MultiCompletor(baseCompletors.toArray)
val completor = new MultiCompletor()
completor.setCompletors( Array(baseCompletor, prefixedCompletor(baseCompletor), specificCompletor(baseCompletor)) )
completor
}
/** Used for a single argument so that the argument can have spaces in it.*/ /** Used for a single argument so that the argument can have spaces in it.*/
object SingleArgumentDelimiter extends ArgumentCompletor.AbstractArgumentDelimiter object SingleArgumentDelimiter extends ArgumentCompletor.AbstractArgumentDelimiter
{ {
@ -99,23 +123,10 @@ class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger
c.setStrict(true) c.setStrict(true)
c c
} }
}
private def propertyCompletor(propertyNames: Iterable[String]) = private class LazyCompletor(delegate0: => Completor) extends Completor
simpleArgumentCompletor(propertyActions, propertyNames) {
private def prefixedCompletor(baseCompletor: Completor) = private lazy val delegate = delegate0
singleArgumentCompletor(simpleCompletor(prefixes), baseCompletor) def complete(buffer: String, cursor: Int, candidates: java.util.List[_]): Int =
private def specificCompletor(baseCompletor: Completor) = delegate.complete(buffer, cursor, candidates)
{
val specific = simpleCompletor(specificPrefix :: Nil) // TODO
new ArgumentCompletor( Array( specific, simpleCompletor(scalaVersions), baseCompletor ) )
}
def setVariableCompletions(taskNames: Iterable[String], propertyNames: Iterable[String], extra: Iterable[(String, Iterable[String])] )
{
import scala.collection.immutable.TreeSet
val taskCompletor = simpleCompletor(TreeSet(taskNames.toSeq : _*))
val extraCompletors = for( (first, repeat) <- extra) yield repeatedArgumentCompletor(simpleCompletor(first :: Nil), simpleCompletor(repeat))
val baseCompletors = generalCompletor :: taskCompletor :: projectCompletor :: propertyCompletor(propertyNames) :: extraCompletors.toList
val baseCompletor = new MultiCompletor(baseCompletors.toArray)
completor.setCompletors( Array(baseCompletor, prefixedCompletor(baseCompletor), specificCompletor(baseCompletor)) )
}
} }

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

@ -98,7 +98,6 @@ class xMain extends xsbti.AppMain
{ {
project.log.info("Building project " + project.name + " " + project.version.toString + " against Scala " + project.buildScalaVersion) project.log.info("Building project " + project.name + " " + project.version.toString + " against Scala " + project.buildScalaVersion)
project.log.info(" using " + project.getClass.getName + " with sbt " + project.sbtVersion.value + " and Scala " + project.defScalaVersion.value) project.log.info(" using " + project.getClass.getName + " with sbt " + project.sbtVersion.value + " and Scala " + project.defScalaVersion.value)
processArguments(project, initialize(remainingArguments), configuration, startTime) match processArguments(project, initialize(remainingArguments), configuration, startTime) match
{ {
case e: xsbti.Exit => case e: xsbti.Exit =>
@ -308,13 +307,12 @@ class xMain extends xsbti.AppMain
// todo: project.log.info("No actions specified, interactive session started. Execute 'help' for more information.") // todo: project.log.info("No actions specified, interactive session started. Execute 'help' for more information.")
private def prompt(baseProject: Project, project: Project): String = private def prompt(baseProject: Project, project: Project): String =
{ {
val projectNames = baseProject.projectClosure.map(_.name) lazy val projectNames = baseProject.projectClosure.map(_.name)
val prefixes = ContinuousExecutePrefix :: CrossBuildPrefix :: Nil val prefixes = ContinuousExecutePrefix :: CrossBuildPrefix :: Nil
val scalaVersions = baseProject.crossScalaVersions ++ Seq(baseProject.defScalaVersion.value) lazy val scalaVersions = baseProject.crossScalaVersions ++ Seq(baseProject.defScalaVersion.value)
val completors = new Completors(ProjectAction, projectNames, interactiveCommands, List(GetAction, SetAction), SpecificBuildPrefix, scalaVersions, prefixes) lazy val methodCompletions = for( (name, method) <- project.methods) yield (name, method.completions)
val reader = new JLineReader(baseProject.historyPath, completors, baseProject.log) lazy val completors = new Completors(ProjectAction, projectNames, interactiveCommands, List(GetAction, SetAction), SpecificBuildPrefix, scalaVersions, prefixes, project.taskNames, project.propertyNames, methodCompletions)
val methodCompletions = for( (name, method) <- project.methods) yield (name, method.completions) val reader = new LazyJLineReader(baseProject.historyPath, MainCompletor(completors), baseProject.log)
reader.setVariableCompletions(project.taskNames, project.propertyNames, methodCompletions)
reader.readLine("> ").getOrElse(ExitCommand) reader.readLine("> ").getOrElse(ExitCommand)
} }