Skip to content

Commit 52dd158

Browse files
committed
Fix indentation
1 parent ae89c53 commit 52dd158

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

shared/src/main/scala/scala/util/parsing/combinator/Parsers.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -949,12 +949,12 @@ trait Parsers {
949949
*/
950950
trait OnceParser[+T] extends Parser[T] {
951951
override def ~ [U](p: => Parser[U]): Parser[~[T, U]]
952-
= OnceParser{ (for(a <- this; b <- commit(p)) yield new ~(a,b)).named("~") }
952+
= OnceParser{ (for(a <- this; b <- commit(p)) yield new ~(a,b)).named("~") }
953953

954954
override def ~> [U](p: => Parser[U]): Parser[U]
955-
= OnceParser{ (for(a <- this; b <- commit(p)) yield b).named("~>") }
955+
= OnceParser{ (for(a <- this; b <- commit(p)) yield b).named("~>") }
956956

957957
override def <~ [U](p: => Parser[U]): Parser[T]
958-
= OnceParser{ (for(a <- this; b <- commit(p)) yield a).named("<~") }
958+
= OnceParser{ (for(a <- this; b <- commit(p)) yield a).named("<~") }
959959
}
960960
}

shared/src/test/scala/scala/util/parsing/combinator/t6464.scala

+18-15
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,28 @@ class t6464 {
1515
| "<%" ~! err("should not fail here, because of ~!"))
1616

1717
}
18-
@Test
19-
def test: Unit = {
20-
assertEquals(
21-
"[1.9] parsed: ((((<%~List( ))~hi)~List( ))~%>)",
22-
SspParser.phrase(SspParser.ok)(new CharSequenceReader("<% hi %>")).toString)
23-
val expected = """[1.7] error: string matching regex '\w+' expected but '%' found
18+
19+
@Test
20+
def test: Unit = {
21+
assertEquals(
22+
"[1.9] parsed: ((((<%~List( ))~hi)~List( ))~%>)",
23+
SspParser.phrase(SspParser.ok)(new CharSequenceReader("<% hi %>")).toString)
24+
25+
val expected = """[1.7] error: string matching regex '\w+' expected but '%' found
2426
2527
<% %>
2628
^"""
27-
assertEquals(
28-
expected,
29-
SspParser.phrase(SspParser.ok)(new CharSequenceReader("<% %>")).toString)
3029

31-
assertEquals(
32-
"[1.9] parsed: hi",
33-
SspParser.phrase(SspParser.buggy)(new CharSequenceReader("<% hi %>")).toString)
30+
assertEquals(
31+
expected,
32+
SspParser.phrase(SspParser.ok)(new CharSequenceReader("<% %>")).toString)
33+
34+
assertEquals(
35+
"[1.9] parsed: hi",
36+
SspParser.phrase(SspParser.buggy)(new CharSequenceReader("<% hi %>")).toString)
3437

35-
assertEquals(
36-
expected,
37-
SspParser.phrase(SspParser.buggy)(new CharSequenceReader("<% %>")).toString)
38+
assertEquals(
39+
expected,
40+
SspParser.phrase(SspParser.buggy)(new CharSequenceReader("<% %>")).toString)
3841
}
3942
}

0 commit comments

Comments
 (0)