From 8c0e400c110f41a36913cb9a7c9cce43d1af2c0b Mon Sep 17 00:00:00 2001 From: "andrzej.jozwik@gmail.com" Date: Fri, 17 Oct 2014 22:23:20 +0200 Subject: [PATCH] Add ; instead of brackets to xml group --- .../scala/sbt/internals/parser/SbtParser.scala | 14 ++++---------- .../resources/session-settings-quick/3.sbt.txt | 16 ++++++++++++++++ .../session-settings-quick/3.sbt.txt_1/1.set | 1 + .../3.sbt.txt_1/1.set.result | 5 +++++ .../resources/session-settings-quick/4.sbt.txt | 17 ----------------- .../session-settings-quick/4.sbt.txt_1/1.set | 1 - .../4.sbt.txt_1/1.set.result | 15 --------------- .../session-settings/3.sbt.txt_1/1.set.result | 2 +- 8 files changed, 27 insertions(+), 44 deletions(-) create mode 100644 main/src/test/resources/session-settings-quick/3.sbt.txt create mode 100644 main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set create mode 100644 main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set.result delete mode 100644 main/src/test/resources/session-settings-quick/4.sbt.txt delete mode 100644 main/src/test/resources/session-settings-quick/4.sbt.txt_1/1.set delete mode 100644 main/src/test/resources/session-settings-quick/4.sbt.txt_1/1.set.result diff --git a/main/src/main/scala/sbt/internals/parser/SbtParser.scala b/main/src/main/scala/sbt/internals/parser/SbtParser.scala index 59f0d9ac4..a1a85d773 100644 --- a/main/src/main/scala/sbt/internals/parser/SbtParser.scala +++ b/main/src/main/scala/sbt/internals/parser/SbtParser.scala @@ -200,9 +200,7 @@ private[sbt] object XmlContent { private val DOUBLE_SLASH = "//" - private val OPEN_BRACKET = s" $OPEN_CURLY_BRACKET " - - private val CLOSE_BRACKET = " ) " + private val CLOSE_XML_STATEMENT = ";" /** * @@ -356,7 +354,7 @@ private[sbt] object XmlContent { val (correctedStmt, shouldAddCloseBrackets, wasXml, _) = addBracketsIfNecessary(statements) val closeIfNecessaryCorrectedStmt = if (shouldAddCloseBrackets && wasXml) { - correctedStmt.head +: CLOSE_BRACKET +: correctedStmt.tail + correctedStmt.head +: CLOSE_XML_STATEMENT +: correctedStmt.tail } else { correctedStmt } @@ -372,7 +370,7 @@ private[sbt] object XmlContent { val (newShouldAddCloseBracket, newStmtAcc) = if (isXml) { addOpenBracketIfNecessary(accStmt, shouldAddCloseBracket, prvWasXml, prvStmt) } else if (shouldAddCloseBracket) { - (false, CLOSE_BRACKET +: accStmt) + (false, CLOSE_XML_STATEMENT +: accStmt) } else { (false, accStmt) } @@ -386,11 +384,7 @@ private[sbt] object XmlContent { if (prvWasXml) { (shouldAddCloseBracket, stmtAcc) } else { - if (areBracketsNecessary(prvStatement)) { - (true, OPEN_BRACKET +: stmtAcc) - } else { - (false, stmtAcc) - } + (areBracketsNecessary(prvStatement), stmtAcc) } /** diff --git a/main/src/test/resources/session-settings-quick/3.sbt.txt b/main/src/test/resources/session-settings-quick/3.sbt.txt new file mode 100644 index 000000000..6db83e79c --- /dev/null +++ b/main/src/test/resources/session-settings-quick/3.sbt.txt @@ -0,0 +1,16 @@ +import sbt._ + +val scmpom = taskKey[xml.NodeBuffer]("Node buffer") + +scmpom := + git@github.com:mohiva/play-html-compressor.git + scm:git:git@github.com:mohiva/play-html-compressor.git + + + + akkie + Christian Kaps + http://mohiva.com + + + \ No newline at end of file diff --git a/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set b/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set new file mode 100644 index 000000000..3e2aa8d48 --- /dev/null +++ b/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set @@ -0,0 +1 @@ +scmpom := OK \ No newline at end of file diff --git a/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set.result b/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set.result new file mode 100644 index 000000000..2c18733df --- /dev/null +++ b/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set.result @@ -0,0 +1,5 @@ +import sbt._ + +val scmpom = taskKey[xml.NodeBuffer]("Node buffer") + +scmpom := OK; \ No newline at end of file diff --git a/main/src/test/resources/session-settings-quick/4.sbt.txt b/main/src/test/resources/session-settings-quick/4.sbt.txt deleted file mode 100644 index 5d1bcd5b2..000000000 --- a/main/src/test/resources/session-settings-quick/4.sbt.txt +++ /dev/null @@ -1,17 +0,0 @@ -k1 := {} - -k2 := {} - -k3 := { - - - val x = "hi" - () -} - -k4 := { }; k5 := () - -k1 <<= k1 map {_ => sys.error("k1")} - -k4 := { val x = k4.value; () } - diff --git a/main/src/test/resources/session-settings-quick/4.sbt.txt_1/1.set b/main/src/test/resources/session-settings-quick/4.sbt.txt_1/1.set deleted file mode 100644 index 2a3525578..000000000 --- a/main/src/test/resources/session-settings-quick/4.sbt.txt_1/1.set +++ /dev/null @@ -1 +0,0 @@ -k4 := () diff --git a/main/src/test/resources/session-settings-quick/4.sbt.txt_1/1.set.result b/main/src/test/resources/session-settings-quick/4.sbt.txt_1/1.set.result deleted file mode 100644 index 3f5ec19f4..000000000 --- a/main/src/test/resources/session-settings-quick/4.sbt.txt_1/1.set.result +++ /dev/null @@ -1,15 +0,0 @@ -k1 := {} - -k2 := {} - -k3 := { - - - val x = "hi" - () -} - -k4 := (); k5 := () - -k1 <<= k1 map {_ => sys.error("k1")} - diff --git a/main/src/test/resources/session-settings/3.sbt.txt_1/1.set.result b/main/src/test/resources/session-settings/3.sbt.txt_1/1.set.result index 6b1956fb1..2c18733df 100644 --- a/main/src/test/resources/session-settings/3.sbt.txt_1/1.set.result +++ b/main/src/test/resources/session-settings/3.sbt.txt_1/1.set.result @@ -2,4 +2,4 @@ import sbt._ val scmpom = taskKey[xml.NodeBuffer]("Node buffer") -scmpom := ( OK ) \ No newline at end of file +scmpom := OK; \ No newline at end of file