mirror of https://github.com/sbt/sbt.git
remove unnecessary default arguments from Build
This commit is contained in:
Mark Harrah
parent
767a1e47c1
commit
7390876874
|
|
@ -19,7 +19,7 @@ object Build
|
|||
def loader(configuration: xsbti.AppConfiguration): ClassLoader =
|
||||
configuration.provider.mainClass.getClassLoader
|
||||
|
||||
def apply(command: LoadCommand, configuration: xsbti.AppConfiguration, allowMultiple: Boolean = false): Seq[Any] =
|
||||
def apply(command: LoadCommand, configuration: xsbti.AppConfiguration, allowMultiple: Boolean): Seq[Any] =
|
||||
command match
|
||||
{
|
||||
case BinaryLoad(classpath, module, name) =>
|
||||
|
|
@ -30,14 +30,14 @@ object Build
|
|||
project(base, auto, name, configuration, allowMultiple)._1
|
||||
}
|
||||
|
||||
def project(base: File, auto: Auto.Value, name: String, configuration: xsbti.AppConfiguration, allowMultiple: Boolean = false): (Seq[Any], Analysis) =
|
||||
def project(base: File, auto: Auto.Value, name: String, configuration: xsbti.AppConfiguration, allowMultiple: Boolean): Seq[Any] =
|
||||
{
|
||||
val buildDir = base / "project" / "build"
|
||||
val sources = buildDir * "*.scala" +++ buildDir / "src" / "main" / "scala" ** "*.scala"
|
||||
source(Nil, sources.get.toSeq, Some(buildDir / "target" asFile), false, auto, name, configuration, allowMultiple)
|
||||
}
|
||||
|
||||
def binary(classpath: Seq[File], module: Boolean, name: String, parent: ClassLoader, allowMultiple: Boolean = false): Seq[Any] =
|
||||
def binary(classpath: Seq[File], module: Boolean, name: String, parent: ClassLoader, allowMultiple: Boolean): Seq[Any] =
|
||||
{
|
||||
if(name.isEmpty)
|
||||
error("Class name required to load binary project.")
|
||||
|
|
|
|||
|
|
@ -1,157 +0,0 @@
|
|||
/* sbt -- Simple Build Tool
|
||||
* Copyright 2008, 2009 Mark Harrah
|
||||
*/
|
||||
package sbt
|
||||
|
||||
trait LineReader extends NotNull
|
||||
{
|
||||
def readLine(prompt: String): Option[String]
|
||||
}
|
||||
class Completors(val projectAction: String, projectNames0: => Iterable[String],
|
||||
val generalCommands: Iterable[String], val propertyActions: Iterable[String],
|
||||
val specificPrefix: String, scalaVersions0: => Iterable[String],
|
||||
val prefixes: Iterable[String], val taskNames: Iterable[String],
|
||||
propertyNames0: => Iterable[String], val extra: ExtraCompletions) extends NotNull
|
||||
{
|
||||
lazy val scalaVersions = scalaVersions0
|
||||
lazy val propertyNames = propertyNames0
|
||||
lazy val projectNames = projectNames0
|
||||
}
|
||||
|
||||
trait ExtraCompletions extends NotNull
|
||||
{
|
||||
def names: Iterable[String]
|
||||
def completions(name: String): Iterable[String]
|
||||
}
|
||||
|
||||
|
||||
import jline.{Completor, ConsoleReader}
|
||||
abstract class JLine extends LineReader
|
||||
{
|
||||
protected[this] val reader: ConsoleReader
|
||||
def readLine(prompt: String) = JLine.withJLine { unsynchronizedReadLine(prompt) }
|
||||
private[this] def unsynchronizedReadLine(prompt: String) =
|
||||
reader.readLine(prompt) match
|
||||
{
|
||||
case null => None
|
||||
case x => Some(x.trim)
|
||||
}
|
||||
}
|
||||
private object JLine
|
||||
{
|
||||
def terminal = jline.Terminal.getTerminal
|
||||
def resetTerminal() = withTerminal { _ => jline.Terminal.resetTerminal }
|
||||
private def withTerminal[T](f: jline.Terminal => T): T =
|
||||
synchronized
|
||||
{
|
||||
val t = terminal
|
||||
t.synchronized { f(t) }
|
||||
}
|
||||
def createReader() =
|
||||
withTerminal { t =>
|
||||
val cr = new ConsoleReader
|
||||
t.enableEcho()
|
||||
cr.setBellEnabled(false)
|
||||
cr
|
||||
}
|
||||
def withJLine[T](action: => T): T =
|
||||
withTerminal { t =>
|
||||
t.disableEcho()
|
||||
try { action }
|
||||
finally { t.enableEcho() }
|
||||
}
|
||||
private[sbt] def initializeHistory(cr: ConsoleReader, historyPath: Option[Path], log: Logger): Unit =
|
||||
for(historyLocation <- historyPath)
|
||||
{
|
||||
val historyFile = historyLocation.asFile
|
||||
Control.trapAndLog(log)
|
||||
{
|
||||
historyFile.getParentFile.mkdirs()
|
||||
val history = cr.getHistory
|
||||
history.setMaxSize(MaxHistorySize)
|
||||
history.setHistoryFile(historyFile)
|
||||
}
|
||||
}
|
||||
def simple(historyPath: Option[Path], log: Logger): SimpleReader = new SimpleReader(historyPath, log)
|
||||
val MaxHistorySize = 500
|
||||
}
|
||||
class SimpleReader private[sbt] (historyPath: Option[Path], log: Logger) extends JLine
|
||||
{
|
||||
protected[this] val reader = JLine.createReader()
|
||||
JLine.initializeHistory(reader, historyPath, log)
|
||||
}
|
||||
object SimpleReader extends JLine
|
||||
{
|
||||
protected[this] val reader = JLine.createReader()
|
||||
}
|
||||
private[sbt] final class LazyJLineReader(historyPath: Option[Path], completor: => Completor, log: Logger) extends JLine
|
||||
{
|
||||
protected[this] val reader =
|
||||
{
|
||||
val cr = new ConsoleReader
|
||||
cr.setBellEnabled(false)
|
||||
JLine.initializeHistory(cr, historyPath, log)
|
||||
cr.addCompletor(new LazyCompletor(completor))
|
||||
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
|
||||
argumentCompletor( Array( specific, lazySimpleCompletor(scalaVersions), baseCompletor ) )
|
||||
}
|
||||
def extraCompletor(name: String) =
|
||||
repeatedArgumentCompletor(simpleCompletor(name :: Nil), lazySimpleCompletor(extra.completions(name)))
|
||||
val taskCompletor = simpleCompletor(TreeSet(taskNames.toSeq : _*))
|
||||
val extraCompletors = extra.names.map(extraCompletor)
|
||||
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
|
||||
}
|
||||
/** Used for a single argument so that the argument can have spaces in it.*/
|
||||
object SingleArgumentDelimiter extends ArgumentCompletor.AbstractArgumentDelimiter
|
||||
{
|
||||
def isDelimiterChar(buffer: String, pos: Int) =
|
||||
(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), lazySimpleCompletor(second))
|
||||
private def singleArgumentCompletor(first: Completor, second: Completor) =
|
||||
{
|
||||
val completors = Array(first, second, new NullCompletor)
|
||||
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
|
||||
{
|
||||
private lazy val delegate = delegate0
|
||||
def complete(buffer: String, cursor: Int, candidates: java.util.List[_]): Int =
|
||||
delegate.complete(buffer, cursor, candidates)
|
||||
}
|
||||
Loading…
Reference in New Issue