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

Revert to previous version.

This commit is contained in:
andrzej.jozwik@gmail.com 2014-10-14 11:24:12 +02:00
parent ddc80357dc
commit ef74db7319
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
main/src/main/scala/sbt/internals/parser/SbtParser.scala
View File

@ -23,13 +23,10 @@ private[sbt] object SbtParser {
sealed trait ParsedSbtFileExpressions {
/** The set of parsed import expressions. */
def imports: Seq[(String, Int)]
/** The set of parsed defintions and/or sbt build settings. */
def settings: Seq[(String, LineRange)]
/** The set of scala tree's for parsed definitions/settings and the underlying string representation.. */
def settingsTrees: Seq[(String, Tree)]
/** Represents the changes we had to perform to the sbt file so that XML will parse correctly. */
def modifiedContent: String
}
@ -232,17 +229,13 @@ private[sbt] object XmlContent {
(accSeqIndex, el) =>
val (statement, startIndex, endIndex) = el
val (accSeq, index) = accSeqIndex
val (st, textStatementOption) = if (index >= startIndex) {
(statement, None)
val textStatementOption = if (index >= startIndex) {
None
} else {
val s = content.substring(index, startIndex)
if (s.trim.isEmpty) {
(statement + s, None)
} else {
(statement, Some((s, false)))
}
Some((s, false))
}
val newAccSeq = (st, true) +: addOptionToCollection(accSeq, textStatementOption)
val newAccSeq = (statement, true) +: addOptionToCollection(accSeq, textStatementOption)
(newAccSeq, endIndex)
}
val endOfFile = content.substring(index, content.length)
@ -359,22 +352,18 @@ private[sbt] object XmlContent {
* @return content with xml with brackets
*/
private def addExplicitXmlContent(content: String, xmlParts: Seq[(String, Int, Int)]): String = {
val statementsXml = splitFile(content, xmlParts)
val (correctedStmt, shouldAddCloseBrackets, wasXml, _) = addBracketsIfNecessary(statementsXml)
val statements: Seq[(String, Boolean)] = splitFile(content, xmlParts)
val (correctedStmt, shouldAddCloseBrackets, wasXml, _) = addBracketsIfNecessary(statements)
val closeIfNecessaryCorrectedStmt =
if (shouldAddCloseBrackets && wasXml) {
if (correctedStmt.head.trim.isEmpty) {
CLOSE_BRACKET +: correctedStmt
} else {
correctedStmt.head +: CLOSE_BRACKET +: correctedStmt.tail
}
correctedStmt.head +: CLOSE_BRACKET +: correctedStmt.tail
} else {
correctedStmt
}
closeIfNecessaryCorrectedStmt.reverse.mkString
}
private def addBracketsIfNecessary(statements: Seq[(String, Boolean)]): (Seq[String], Boolean, Boolean, String) = {
def addBracketsIfNecessary(statements: Seq[(String, Boolean)]): (Seq[String], Boolean, Boolean, String) = {
statements.foldLeft((Seq.empty[String], false, false, "")) {
case ((accStmt, shouldAddCloseBracket, prvWasXml, prvStmt), (stmt, isXml)) =>
if (stmt.trim.isEmpty) {