Skip to content
This repository was archived by the owner on Jun 15, 2023. It is now read-only.

Commit 85b332c

Browse files
authored
Fix tests broken by 03a387a (#131)
1 parent 1313749 commit 85b332c

File tree

10 files changed

+111
-221
lines changed

10 files changed

+111
-221
lines changed

tests/parsing/errors/expressions/__snapshots__/parse.spec.js.snap

Lines changed: 28 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ let x = ((let a = 1 in let b = 2 in fun pattern -> (\\"test\\" : int))
88
=====Errors=============================================
99
1010
Syntax error!
11-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/ambiguousArrow.js:1:9-21
12-
11+
parsing/errors/expressions/ambiguousArrow.js:1:9-21
1312
1 │ let a = b:int => \\"hi\\"
1413
2 │
1514
3 │ let x = {
@@ -20,8 +19,7 @@ let x = ((let a = 1 in let b = 2 in fun pattern -> (\\"test\\" : int))
2019
2120
2221
Syntax error!
23-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/ambiguousArrow.js:6:3-23
24-
22+
parsing/errors/expressions/ambiguousArrow.js:6:3-23
2523
4let a = 1
2624
5let b = 2
2725
6a + b : int => \\"test\\"
@@ -43,8 +41,7 @@ let xs = x.map (fun key -> [|key;(predicates.(key))|])
4341
=====Errors=============================================
4442
4543
Syntax error!
46-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/array.js:2:44
47-
44+
parsing/errors/expressions/array.js:2:44
4845
1 │ // missing ] before )
4946
2 │ let xs = x.map(key => [key, predicates[key])
5047
3 │
@@ -63,8 +60,7 @@ exports[`arrow.js 1`] = `
6360
=====Errors=============================================
6461
6562
Syntax error!
66-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/arrow.js:1:52
67-
63+
parsing/errors/expressions/arrow.js:1:52
6864
1 │ Object.keys(providers).reduce((elements, providerId] => {
6965
2let x = 1
7066
3let b = 2
@@ -102,8 +98,7 @@ let pipeline =
10298
=====Errors=============================================
10399
104100
Syntax error!
105-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/block.js:14:4-15:1
106-
101+
parsing/errors/expressions/block.js:14:4-15:1
107102
12 │
108103
13 │ thisId === id
109104
14 │ }
@@ -114,8 +109,7 @@ let pipeline =
114109
Did you forget a \`)\` here?
115110
116111
Syntax error!
117-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/block.js:18:25-19:1
118-
112+
parsing/errors/expressions/block.js:18:25-19:1
119113
16 │
120114
17 │ let x = {
121115
18loop(0, Nil->push(doc)
@@ -126,8 +120,7 @@ let pipeline =
126120
Did you forget a \`)\` here?
127121
128122
Syntax error!
129-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/block.js:22:11-23:1
130-
123+
parsing/errors/expressions/block.js:22:11-23:1
131124
20
132125
21switch stack {
133126
22 │ | Empty =>
@@ -138,8 +131,7 @@ let pipeline =
138131
Looks like there might be an expression missing here
139132
140133
Syntax error!
141-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/block.js:26:7-27:1
142-
134+
parsing/errors/expressions/block.js:26:7-27:1
143135
24 │ | Join(doc1, doc2) =>
144136
25 │ buffer->Buffer.add_string(indentation)
145137
26 │ loop(
@@ -150,8 +142,7 @@ let pipeline =
150142
Did you forget a \`)\` here?
151143
152144
Syntax error!
153-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/block.js:30:10-31:1
154-
145+
parsing/errors/expressions/block.js:30:10-31:1
155146
28
156147
29let pipeline = switch scheduler {
157148
30 │ | Some =>
@@ -175,17 +166,15 @@ let () = ((let open Foo in let exception End in x ())[@ns.braces ])
175166
=====Errors=============================================
176167
177168
Syntax error!
178-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/consecutive.res:1:23
179-
169+
parsing/errors/expressions/consecutive.res:1:23
180170
1 │ let f = (a,b) => a + 3b;
181171
2 │
182172
3 │ let f = (g, h) => {
183173
184174
consecutive statements on a line must be separated by ';' or a newline
185175
186176
Syntax error!
187-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/consecutive.res:4:7
188-
177+
parsing/errors/expressions/consecutive.res:4:7
189178
2
190179
3let f = (g, h) => {
191180
4a + 3b
@@ -195,8 +184,7 @@ let () = ((let open Foo in let exception End in x ())[@ns.braces ])
195184
consecutive expressions on a line must be separated by ';' or a newline
196185
197186
Syntax error!
198-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/consecutive.res:8:16-27
199-
187+
parsing/errors/expressions/consecutive.res:8:16-27
200188
6
201189
7let () = {
202190
8 │ sideEffect1() sideEffect2()
@@ -206,8 +194,7 @@ let () = ((let open Foo in let exception End in x ())[@ns.braces ])
206194
consecutive expressions on a line must be separated by ';' or a newline
207195
208196
Syntax error!
209-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/consecutive.res:12:11-20
210-
197+
parsing/errors/expressions/consecutive.res:12:11-20
211198
10
212199
11let () = {
213200
12 │ open Foo exception End
@@ -227,17 +214,15 @@ let f a b = ((())[@ns.braces ])
227214
=====Errors=============================================
228215
229216
Syntax error!
230-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/emptyBlock.js:1:10
231-
217+
parsing/errors/expressions/emptyBlock.js:1:10
232218
1 │ let x = {}
233219
2 │
234220
3 │ let f = (a, b) => {}
235221
236222
This let-binding misses an expression
237223
238224
Syntax error!
239-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/emptyBlock.js:3:20
240-
225+
parsing/errors/expressions/emptyBlock.js:3:20
241226
1 │ let x = {}
242227
2 │
243228
3 │ let f = (a, b) => {}
@@ -255,8 +240,7 @@ exports[`if.js 1`] = `
255240
=====Errors=============================================
256241
257242
Syntax error!
258-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/if.js:2:11-3:5
259-
243+
parsing/errors/expressions/if.js:2:11-3:5
260244
1 │ // missing brace below
261245
2 │ if (match)
262246
3 │ let a = 1
@@ -281,8 +265,7 @@ exports[`ifLet.res 1`] = `
281265
=====Errors=============================================
282266
283267
Syntax error!
284-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/ifLet.res:1:1-3:1
285-
268+
parsing/errors/expressions/ifLet.res:1:1-3:1
286269
1 │ if let Some(x) = result {
287270
2Js.log(\\"The sky is blue\\")
288271
3}
@@ -298,8 +281,7 @@ switch result {
298281
299282
300283
Syntax error!
301-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/ifLet.res:7:8-11:1
302-
284+
parsing/errors/expressions/ifLet.res:7:8-11:1
303285
5 │ if let Error(x) = result {
304286
6Js.log(\\"The sky is red\\")
305287
7} else if let Ok(y) = result {
@@ -332,8 +314,7 @@ module LicenseList = struct end
332314
=====Errors=============================================
333315
334316
Syntax error!
335-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/implementation.res:7:1
336-
317+
parsing/errors/expressions/implementation.res:7:1
337318
5 │ }
338319
6 │ }
339320
7 │ }
@@ -352,8 +333,7 @@ let x = ([%rescript.exprhole ]) + 1
352333
=====Errors=============================================
353334
354335
Syntax error!
355-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/misc.js:1:9
356-
336+
parsing/errors/expressions/misc.js:1:9
357337
1 │ let x = _ + 1
358338
2 │
359339
@@ -371,8 +351,7 @@ let record = { field = ([%rescript.exprhole ]) }
371351
=====Errors=============================================
372352
373353
Syntax error!
374-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/record.js:2:10-3:7
375-
354+
parsing/errors/expressions/record.js:2:10-3:7
376355
1 │ let newWrapper = {
377356
2updateF
378357
3value: f(xWrapper.currentValue),
@@ -382,8 +361,7 @@ let record = { field = ([%rescript.exprhole ]) }
382361
Did you forget a \`,\` here?
383362
384363
Syntax error!
385-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/record.js:8:10-18
386-
364+
parsing/errors/expressions/record.js:8:10-18
387365
6 │
388366
7 │ let newWrapper = {
389367
8updateF updateF2
@@ -393,8 +371,7 @@ let record = { field = ([%rescript.exprhole ]) }
393371
Did you forget a \`:\` here?
394372
395373
Syntax error!
396-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/record.js:13:9-17:0
397-
374+
parsing/errors/expressions/record.js:13:9-17:0
398375
11 │
399376
12 │ let record = {
400377
13field:
@@ -417,8 +394,7 @@ exports[`setField.js 1`] = `
417394
=====Errors=============================================
418395
419396
Syntax error!
420-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/setField.js:4:30-5:1
421-
397+
parsing/errors/expressions/setField.js:4:30-5:1
422398
2 │ let a = 1
423399
3 │ // notice missing expression after =
424400
4 │ m.left.compatibleTypeArgs =
@@ -438,8 +414,7 @@ exports[`taggedTemplateLiterals.js 1`] = `
438414
=====Errors=============================================
439415
440416
Syntax error!
441-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/taggedTemplateLiterals.js:1:1-5
442-
417+
parsing/errors/expressions/taggedTemplateLiterals.js:1:1-5
443418
1 │ foo()\`null\`
444419
2 │
445420
@@ -455,8 +430,7 @@ let parsedPayload = try Js.Json.parseExn response with | _ -> Js.Json.null
455430
=====Errors=============================================
456431
457432
Syntax error!
458-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/try.js:2:37-38
459-
433+
parsing/errors/expressions/try.js:2:37-38
460434
1 ┆ let parsedPayload =
461435
2 ┆ try (Js.Json.parseExn(response)) {
462436
3| _ => Js.Json.null
@@ -475,8 +449,7 @@ let x = (\\"hi\\" : string)
475449
=====Errors=============================================
476450
477451
Syntax error!
478-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/unexpectedConstraint.js:4:3-13
479-
452+
parsing/errors/expressions/unexpectedConstraint.js:4:3-13
480453
2 │ let a = 1
481454
3 │ let b = 2
482455
4 │ a + b : int
@@ -488,8 +461,7 @@ let x = (\\"hi\\" : string)
488461
489462
490463
Syntax error!
491-
/Users/mvalcke/Development/syntax/tests/parsing/errors/expressions/unexpectedConstraint.js:7:9-20
492-
464+
parsing/errors/expressions/unexpectedConstraint.js:7:9-20
493465
5 │ }
494466
6 │
495467
7 │ let x = \\"hi\\": string

tests/parsing/errors/other/__snapshots__/parse.spec.js.snap

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ exports[`patternMatching.js 1`] = `
66
=====Errors=============================================
77
88
Syntax error!
9-
/Users/mvalcke/Development/syntax/tests/parsing/errors/other/patternMatching.js:1:14-2:1
10-
9+
parsing/errors/other/patternMatching.js:1:14-2:1
1110
1 │ switch expr {
1211
2}
1312
3 │
@@ -31,8 +30,7 @@ type nonrec 'extraInfo student =
3130
=====Errors=============================================
3231
3332
Syntax error!
34-
/Users/mvalcke/Development/syntax/tests/parsing/errors/other/regionMissingComma.res:2:31
35-
33+
parsing/errors/other/regionMissingComma.res:2:31
3634
1external make: (
3735
2~style: ReactDOMRe.Style.t=?.
3836
3~image: bool=?,
@@ -41,8 +39,7 @@ type nonrec 'extraInfo student =
4139
Did you forget a \`,\` here?
4240
4341
Syntax error!
44-
/Users/mvalcke/Development/syntax/tests/parsing/errors/other/regionMissingComma.res:8:11-9:11
45-
42+
parsing/errors/other/regionMissingComma.res:8:11-9:11
4643
6 │ type student<'extraInfo> = {
4744
7name: string,
4845
8age: int
@@ -67,17 +64,15 @@ let x::y = myList
6764
=====Errors=============================================
6865
6966
Syntax error!
70-
/Users/mvalcke/Development/syntax/tests/parsing/errors/other/spread.js:1:12-14
71-
67+
parsing/errors/other/spread.js:1:12-14
7268
1 │ let arr = [...x, ...y]
7369
2 │ let [...arr, _] = [1, 2, 3]
7470
3 │
7571
7672
Arrays can't use the \`...\` spread currently. Please use \`concat\` or other Array helpers.
7773
7874
Syntax error!
79-
/Users/mvalcke/Development/syntax/tests/parsing/errors/other/spread.js:2:6-8
80-
75+
parsing/errors/other/spread.js:2:6-8
8176
1 │ let arr = [...x, ...y]
8277
2 │ let [...arr, _] = [1, 2, 3]
8378
3 │
@@ -88,8 +83,7 @@ Explanation: such spread would create a subarray; out of performance concern, ou
8883
Solution: if it's to validate the first few elements, use a \`when\` clause + Array size check + \`get\` checks on the current pattern. If it's to obtain a subarray, use \`Array.sub\` or \`Belt.Array.slice\`.
8984
9085
Syntax error!
91-
/Users/mvalcke/Development/syntax/tests/parsing/errors/other/spread.js:4:21-23
92-
86+
parsing/errors/other/spread.js:4:21-23
9387
2 │ let [...arr, _] = [1, 2, 3]
9488
3 │
9589
4 │ let record = {...x, ...y}
@@ -100,8 +94,7 @@ Solution: if it's to validate the first few elements, use a \`when\` clause + Ar
10094
Explanation: since records have a known, fixed shape, a spread like \`{a, ...b}\` wouldn't make sense, as \`b\` would override every field of \`a\` anyway.
10195
10296
Syntax error!
103-
/Users/mvalcke/Development/syntax/tests/parsing/errors/other/spread.js:5:15-18
104-
97+
parsing/errors/other/spread.js:5:15-18
10598
3 │
10699
4 │ let record = {...x, ...y}
107100
5 │ let {...x, ...y} = myRecord
@@ -113,8 +106,7 @@ Explanation: you can't collect a subset of a record's field into its own record,
113106
Solution: you need to pull out each field you want explicitly.
114107
115108
Syntax error!
116-
/Users/mvalcke/Development/syntax/tests/parsing/errors/other/spread.js:8:13-22
117-
109+
parsing/errors/other/spread.js:8:13-22
118110
6 │
119111
7 │ let myList = list{...x, ...y}
120112
8 │ let list{...x, ...y} = myList

tests/parsing/errors/pattern/__snapshots__/parse.spec.js.snap

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@ let 4 = for [%rescript.patternhole ] = 0 to 10 do Js.log \\"for\\" done
88
=====Errors=============================================
99
1010
Syntax error!
11-
/Users/mvalcke/Development/syntax/tests/parsing/errors/pattern/missing.res:1:5
12-
11+
parsing/errors/pattern/missing.res:1:5
1312
1 │ let = 2
1413
2 │ let = 4
1514
3 │
1615
1716
I was expecting a name for this let-binding. Example: \`let message = \\"hello\\"\`
1817
1918
Syntax error!
20-
/Users/mvalcke/Development/syntax/tests/parsing/errors/pattern/missing.res:2:5
21-
19+
parsing/errors/pattern/missing.res:2:5
2220
1 │ let = 2
2321
2 │ let = 4
2422
3 │
@@ -27,8 +25,7 @@ let 4 = for [%rescript.patternhole ] = 0 to 10 do Js.log \\"for\\" done
2725
I was expecting a name for this let-binding. Example: \`let message = \\"hello\\"\`
2826
2927
Syntax error!
30-
/Users/mvalcke/Development/syntax/tests/parsing/errors/pattern/missing.res:4:5-6
31-
28+
parsing/errors/pattern/missing.res:4:5-6
3229
2 │ let = 4
3330
3 │
3431
4 │ for in 0 to 10 {
@@ -38,8 +35,7 @@ let 4 = for [%rescript.patternhole ] = 0 to 10 do Js.log \\"for\\" done
3835
A for-loop has the following form: \`for i in 0 to 10\`. Did you forget to supply a name before \`in\`?
3936
4037
Syntax error!
41-
/Users/mvalcke/Development/syntax/tests/parsing/errors/pattern/missing.res:9:3-4
42-
38+
parsing/errors/pattern/missing.res:9:3-4
4339
7 │
4440
8 │ switch x {
4541
9| => ()

0 commit comments

Comments
 (0)