Skip to content

Commit 5eb1077

Browse files
Update scalafmt-core to 3.0.7 (#342)
* Update scalafmt-core to 3.0.7 * Reformat with scalafmt 3.0.7
1 parent edfd465 commit 5eb1077

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=3.0.4
1+
version=3.0.7
22
align.openParenCallSite = true
33
align.openParenDefnSite = true
44
maxColumn = 120

modules/parser/src/test/scala/org/dhallj/parser/DhallParserSuite.scala

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class DhallParserSuite extends FunSuite() {
1717
)
1818
// Output from dhall-haskell.
1919
val expectedBytes: Array[Byte] = Array(-126, 24, 28, -125, 24, 26, -125, 0, 100, 76, 105, 115, 116, 103, 78, 97,
20-
116, 117, 114, 97, 108, 100, 84, 121, 112, 101)
20+
116, 117, 114, 97, 108, 100, 84, 121, 112, 101)
2121
val parsed = DhallParser.parse("[]: List Natural: Type")
2222

2323
assert(parsed == expected)
@@ -27,8 +27,9 @@ class DhallParserSuite extends FunSuite() {
2727
test("parse toMap with empty record with annotation on type") {
2828
// Output from dhall-haskell.
2929
val expectedBytes: Array[Byte] = Array(-125, 24, 27, -126, 7, -96, -125, 24, 26, -125, 0, 100, 76, 105, 115, 116,
30-
-126, 7, -94, 102, 109, 97, 112, 75, 101, 121, 100, 84, 101, 120, 116, 104, 109, 97, 112, 86, 97, 108, 117, 101,
31-
100, 66, 111, 111, 108, 100, 84, 121, 112, 101)
30+
-126, 7, -94, 102, 109, 97, 112, 75, 101, 121, 100, 84, 101, 120, 116, 104,
31+
109, 97, 112, 86, 97, 108, 117, 101, 100, 66, 111, 111, 108, 100, 84, 121,
32+
112, 101)
3233
val parsed = DhallParser.parse("toMap {}: List { mapKey : Text, mapValue: Bool }: Type")
3334

3435
assert(parsed.getEncodedBytes.sameElements(expectedBytes))
@@ -37,17 +38,19 @@ class DhallParserSuite extends FunSuite() {
3738
test("parse toMap with empty non-record with annotation on type") {
3839
// Output from dhall-haskell.
3940
val expectedBytes: Array[Byte] = Array(-125, 24, 27, -126, 8, -95, 97, 97, -11, -125, 24, 26, -125, 0, 100, 76, 105,
40-
115, 116, -126, 7, -94, 102, 109, 97, 112, 75, 101, 121, 100, 84, 101, 120, 116, 104, 109, 97, 112, 86, 97, 108,
41-
117, 101, 100, 66, 111, 111, 108, 100, 84, 121, 112, 101)
41+
115, 116, -126, 7, -94, 102, 109, 97, 112, 75, 101, 121, 100, 84, 101, 120,
42+
116, 104, 109, 97, 112, 86, 97, 108, 117, 101, 100, 66, 111, 111, 108, 100,
43+
84, 121, 112, 101)
4244
val parsed = DhallParser.parse("toMap {a=True}: List { mapKey : Text, mapValue: Bool }: Type")
4345

4446
assert(parsed.getEncodedBytes.sameElements(expectedBytes))
4547
}
4648

4749
test("parse merge with annotation on type") {
4850
// Output from dhall-haskell.
49-
val expectedBytes: Array[Byte] = Array(-124, 6, -126, 8, -95, 97, 97, -126, 15, 1, -125, 9, -126, 11, -95, 97, 97,
50-
-10, 97, 97, -125, 24, 26, 103, 78, 97, 116, 117, 114, 97, 108, 100, 84, 121, 112, 101)
51+
val expectedBytes: Array[Byte] =
52+
Array(-124, 6, -126, 8, -95, 97, 97, -126, 15, 1, -125, 9, -126, 11, -95, 97, 97, -10, 97, 97, -125, 24, 26, 103,
53+
78, 97, 116, 117, 114, 97, 108, 100, 84, 121, 112, 101)
5154
val parsed = DhallParser.parse("merge {a=1} <a>.a: Natural: Type")
5255

5356
assert(parsed.getEncodedBytes.sameElements(expectedBytes))

0 commit comments

Comments
 (0)