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

Fixed #1666 - check from last end of line.

This commit is contained in:
andrzej.jozwik@gmail.com 2014-10-13 22:49:26 +02:00
parent d7c76aabf1
commit f1ab893f98
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,8 +439,15 @@ private[sbt] object XmlContent {
*/
private def areBracketsNecessary(statement: String): Boolean = {
val doubleSlash = statement.indexOf(DOUBLE_SLASH)
val endOfLine = statement.indexOf(END_OF_LINE)
if (doubleSlash == NOT_FOUND_INDEX || (doubleSlash < endOfLine)) {
if (doubleSlash != NOT_FOUND_INDEX) {
val endOfLine = statement.indexOf(END_OF_LINE, doubleSlash)
if (endOfLine == NOT_FOUND_INDEX) {
false
} else {
areBracketsNecessary(statement.substring(endOfLine))
}
} else {
val roundBrackets = statement.lastIndexOf(OPEN_CURLY_BRACKET)
val braces = statement.lastIndexOf(OPEN_PARENTHESIS)
val max = roundBrackets.max(braces)
@ -450,8 +457,7 @@ private[sbt] object XmlContent {
val trimmed = statement.substring(max + 1).trim
trimmed.nonEmpty
}
} else {
false
}
}
}

2
main/src/test/scala/sbt/internals/parser/SplitExpressionsFilesTest.scala
View File

@ -12,6 +12,8 @@ import scala.tools.reflect.ToolBoxError
class SplitExpressionsFilesTest extends AbstractSplitExpressionsFilesTest("/old-format/")
//class SplitExpressionsFilesFailedTest extends AbstractSplitExpressionsFilesTest("/fail-format/")
abstract class AbstractSplitExpressionsFilesTest(pathName: String) extends Specification {
case class SplitterComparison(oldSplitterResult: util.Try[(Seq[(String, Int)], Seq[LineRange])], newSplitterResult: util.Try[(Seq[(String, Int)], Seq[LineRange])])