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

SessionSetting to contain seq of line.

This commit is contained in:
Eugene Vigdorchik 2012-02-27 11:46:23 +04:00
parent eaa10b7a48
commit bb646d0437
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/Main.scala
View File

@ -174,7 +174,7 @@ object BuiltinCommands
{ {
import extracted._ import extracted._
val append = Load.transformSettings(Load.projectScope(currentRef), currentRef.build, rootProject, settings) val append = Load.transformSettings(Load.projectScope(currentRef), currentRef.build, rootProject, settings)
session.appendSettings( append map (a => (a, arg))) session.appendSettings( append map (a => (a, arg.split('\n').toList)))
} }
def inspect = Command(InspectCommand, inspectBrief, inspectDetailed)(inspectParser) { case (s, (option, sk)) => def inspect = Command(InspectCommand, inspectBrief, inspectDetailed)(inspectParser) { case (s, (option, sk)) =>
logger(s).info(inspectOutput(s, option, sk)) logger(s).info(inspectOutput(s, option, sk))

13
main/SessionSettings.scala
View File

@ -30,7 +30,7 @@ final case class SessionSettings(currentBuild: URI, currentProject: Map[URI, Str
} }
object SessionSettings object SessionSettings
{ {
type SessionSetting = (Setting[_], String) type SessionSetting = (Setting[_], List[String])
type SessionMap = Map[ProjectRef, Seq[SessionSetting]] type SessionMap = Map[ProjectRef, Seq[SessionSetting]]
def reapply(session: SessionSettings, s: State): State = def reapply(session: SessionSettings, s: State): State =
@ -109,9 +109,8 @@ object SessionSettings
val RangePosition(_, r@LineRange(start, end)) = s.pos val RangePosition(_, r@LineRange(start, end)) = s.pos
def depends(s: Setting[_]) = !s.init.dependencies.isEmpty def depends(s: Setting[_]) = !s.init.dependencies.isEmpty
settings find (_._1.key == s.key) match { settings find (_._1.key == s.key) match {
case Some(ss@(ns, text)) if !depends(s) && !depends(ns) => case Some(ss@(ns, newLines)) if !depends(s) && !depends(ns) =>
val shifted = ns withPos RangePosition(path, LineRange(start - offs, start - offs + 1)) val shifted = ns withPos RangePosition(path, LineRange(start - offs, start - offs + 1))
val newLines = text.split('\n').toList
(offs + end - start - newLines.size, shifted::olds, ss::repl, lineMap + (start -> (end, newLines))) (offs + end - start - newLines.size, shifted::olds, ss::repl, lineMap + (start -> (end, newLines)))
case _ => case _ =>
val shifted = s withPos RangePosition(path, r shift -offs) val shifted = s withPos RangePosition(path, r shift -offs)
@ -129,12 +128,12 @@ object SessionSettings
} }
val exist = tmpLines.reverse val exist = tmpLines.reverse
val adjusted = if(!newSettings.isEmpty && needsTrailingBlank(exist)) exist :+ "" else exist val adjusted = if(!newSettings.isEmpty && needsTrailingBlank(exist)) exist :+ "" else exist
val lines = adjusted ++ newSettings.map(_._2 split '\n').flatten.flatMap(_ :: "" :: Nil) val lines = adjusted ++ newSettings.map(_._2).flatten.flatMap(_ :: "" :: Nil)
IO.writeLines(writeTo, lines) IO.writeLines(writeTo, lines)
val (newWithPos, _) = ((List[SessionSetting](), adjusted.size + 1) /: newSettings) { val (newWithPos, _) = ((List[SessionSetting](), adjusted.size + 1) /: newSettings) {
case ((acc, line), (s, text)) => case ((acc, line), (s, newLines)) =>
val endLine = line + text.split('\n').size val endLine = line + newLines.size
((s withPos RangePosition(path, LineRange(line, endLine)), text)::acc, endLine + 1) ((s withPos RangePosition(path, LineRange(line, endLine)), newLines)::acc, endLine + 1)
} }
(newWithPos.reverse, other ++ oldShifted) (newWithPos.reverse, other ++ oldShifted)
} }