diff options
author | Li Haoyi <haoyi@dropbox.com> | 2014-11-05 22:35:29 -0800 |
---|---|---|
committer | Li Haoyi <haoyi@dropbox.com> | 2014-11-05 22:35:29 -0800 |
commit | c6af197340ac1045afc1506a69a0bdf6f00fd595 (patch) | |
tree | 25dfe8402ea31d653b29bf2df84e80f673a044b4 /scalatexApi/src/test/scala/scalatex/ParserTests.scala | |
parent | 784f3da4192a0e30ddd94cfb10f91d0bc8dc4f7f (diff) | |
download | hands-on-scala-js-c6af197340ac1045afc1506a69a0bdf6f00fd595.tar.gz hands-on-scala-js-c6af197340ac1045afc1506a69a0bdf6f00fd595.tar.bz2 hands-on-scala-js-c6af197340ac1045afc1506a69a0bdf6f00fd595.zip |
if-else error positions now work
Diffstat (limited to 'scalatexApi/src/test/scala/scalatex/ParserTests.scala')
-rw-r--r-- | scalatexApi/src/test/scala/scalatex/ParserTests.scala | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/scalatexApi/src/test/scala/scalatex/ParserTests.scala b/scalatexApi/src/test/scala/scalatex/ParserTests.scala index 68f05cc..68ea441 100644 --- a/scalatexApi/src/test/scala/scalatex/ParserTests.scala +++ b/scalatexApi/src/test/scala/scalatex/ParserTests.scala @@ -163,7 +163,11 @@ object ParserTests extends utest.TestSuite{ _.Body.run(), Block(Seq( Text("\n"), - For("for(x <- 0 until 3)", Block(Seq(Text("\n ", 21), Text("lol", 24)), 21)) + For( + "for(x <- 0 until 3)", + Block(Seq(Text("\n ", 21), Text("lol", 24)), 21), + 1 + ) )) ) 'forBlockBraces - check( @@ -174,7 +178,11 @@ object ParserTests extends utest.TestSuite{ _.Body.run(), Block(Seq( Text("\n"), - For("for(x <- 0 until 3)", Block(Seq(Text("\n ", 22), Text("lol", 25), Text("\n", 28)), 22)) + For( + "for(x <- 0 until 3)", + Block(Seq(Text("\n ", 22), Text("lol", 25), Text("\n", 28)), 22), + 1 + ) )) ) } @@ -194,7 +202,7 @@ object ParserTests extends utest.TestSuite{ |@if(true) | omg""".stripMargin, _.IfElse.run(), - IfElse("if(true)", Block(Seq(Text("\n ", 10), Text("omg", 13)), 10), None) + IfElse("if(true)", Block(Seq(Text("\n ", 10), Text("omg", 13)), 10), None, 1) ) 'ifBlockElseBlock - check( """ @@ -206,7 +214,8 @@ object ParserTests extends utest.TestSuite{ IfElse( "if(true)", Block(Seq(Text("\n ", 10), Text("omg", 13)), 10), - Some(Block(Seq(Text("\n ", 22), Text("wtf", 25)), 22)) + Some(Block(Seq(Text("\n ", 22), Text("wtf", 25)), 22)), + 1 ) ) 'ifBlockElseBraceBlock - check( @@ -219,7 +228,8 @@ object ParserTests extends utest.TestSuite{ IfElse( "if(true)", Block(Seq(Text("\n ", 10), Text("omg", 13), Text("\n", 16)), 10), - Some(Block(Seq(Text("\n ", 23), Text("wtf", 26), Text("\n", 29)), 23)) + Some(Block(Seq(Text("\n ", 23), Text("wtf", 26), Text("\n", 29)), 23)), + 0 ) ) 'ifBlockElseBraceBlockNested - { @@ -243,7 +253,8 @@ object ParserTests extends utest.TestSuite{ ), 16), Some(Block(Vector( Text("\n ", 35), Text("lols", 40), Text("\n ", 44) - ), 35)) + ), 35)), + 6 )), 3)), 1), Text("\n", 48) )) |