Skip to content

Commit 0209b80

Browse files
liam923liam923
committed
Promote more good test changes
1 parent e0b120f commit 0209b80

File tree

6 files changed

+43
-96
lines changed

6 files changed

+43
-96
lines changed

‎tests/test-dirs/occurrences/project-wide/for-renaming/r-modules-and-types.t‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,18 @@
5050
"end": {
5151
"line": 2,
5252
"col": 7
53-
}
53+
},
54+
"stale": false
5455
},
5556
{
5657
"file": "$TESTCASE_ROOT/main.ml",
5758
"start": {
58-
"line": 5,
59-
"col": 25
59+
"line": 4,
60+
"col": 11
6061
},
6162
"end": {
62-
"line": 5,
63-
"col": 26
63+
"line": 4,
64+
"col": 12
6465
},
6566
"stale": false
6667
},
@@ -73,7 +74,8 @@
7374
"end": {
7475
"line": 2,
7576
"col": 7
76-
}
77+
},
78+
"stale": false
7779
},
7880
{
7981
"file": "$TESTCASE_ROOT/lib.mli",
@@ -84,18 +86,8 @@
8486
"end": {
8587
"line": 2,
8688
"col": 7
87-
}
88-
},
89-
{
90-
"file": "$TESTCASE_ROOT/main.ml",
91-
"start": {
92-
"line": 4,
93-
"col": 11
9489
},
95-
"end": {
96-
"line": 4,
97-
"col": 12
98-
}
90+
"stale": false
9991
}
10092
],
10193
"notifications": []

‎tests/test-dirs/occurrences/project-wide/mli-vs-ml.t‎

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ the interface and the implementation.
6868
"end": {
6969
"line": 2,
7070
"col": 6
71-
}
71+
},
72+
"stale": false
7273
},
7374
{
7475
"file": "$TESTCASE_ROOT/main.ml",
@@ -79,17 +80,6 @@ the interface and the implementation.
7980
"end": {
8081
"line": 3,
8182
"col": 9
82-
}
83-
},
84-
{
85-
"file": "$TESTCASE_ROOT/main.mli",
86-
"start": {
87-
"line": 2,
88-
"col": 8
89-
},
90-
"end": {
91-
"line": 2,
92-
"col": 9
9383
},
9484
"stale": false
9585
}
@@ -137,7 +127,8 @@ Same when the cursor is at the origin:
137127
"end": {
138128
"line": 2,
139129
"col": 6
140-
}
130+
},
131+
"stale": false
141132
},
142133
{
143134
"file": "$TESTCASE_ROOT/main.ml",
@@ -148,18 +139,8 @@ Same when the cursor is at the origin:
148139
"end": {
149140
"line": 3,
150141
"col": 9
151-
}
152-
},
153-
{
154-
"file": "$TESTCASE_ROOT/main.mli",
155-
"start": {
156-
"line": 2,
157-
"col": 8
158142
},
159-
"end": {
160-
"line": 2,
161-
"col": 9
162-
}
143+
"stale": false
163144
}
164145
],
165146
"notifications": []
@@ -181,7 +162,8 @@ It also works when querying for t from the implementation:
181162
"end": {
182163
"line": 2,
183164
"col": 6
184-
}
165+
},
166+
"stale": false
185167
},
186168
{
187169
"file": "$TESTCASE_ROOT/main.ml",
@@ -192,7 +174,8 @@ It also works when querying for t from the implementation:
192174
"end": {
193175
"line": 3,
194176
"col": 9
195-
}
177+
},
178+
"stale": false
196179
},
197180
{
198181
"file": "$TESTCASE_ROOT/main.mli",
@@ -203,7 +186,8 @@ It also works when querying for t from the implementation:
203186
"end": {
204187
"line": 1,
205188
"col": 6
206-
}
189+
},
190+
"stale": false
207191
},
208192
{
209193
"file": "$TESTCASE_ROOT/main.mli",
@@ -238,7 +222,8 @@ It also works when querying for x from the implementation:
238222
"end": {
239223
"line": 1,
240224
"col": 5
241-
}
225+
},
226+
"stale": false
242227
},
243228
{
244229
"file": "$TESTCASE_ROOT/main.mli",
@@ -249,7 +234,8 @@ It also works when querying for x from the implementation:
249234
"end": {
250235
"line": 2,
251236
"col": 5
252-
}
237+
},
238+
"stale": false
253239
}
254240
],
255241
"notifications": []
@@ -271,7 +257,8 @@ It also works when querying for x from the interface:
271257
"end": {
272258
"line": 2,
273259
"col": 5
274-
}
260+
},
261+
"stale": false
275262
},
276263
{
277264
"file": "$TESTCASE_ROOT/main.ml",
@@ -282,7 +269,8 @@ It also works when querying for x from the interface:
282269
"end": {
283270
"line": 1,
284271
"col": 5
285-
}
272+
},
273+
"stale": false
286274
}
287275
],
288276
"notifications": []
@@ -315,7 +303,8 @@ get confused if both identifers are the same.
315303
"end": {
316304
"line": 1,
317305
"col": 6
318-
}
306+
},
307+
"stale": false
319308
},
320309
{
321310
"file": "$TESTCASE_ROOT/main.ml",
@@ -326,7 +315,8 @@ get confused if both identifers are the same.
326315
"end": {
327316
"line": 3,
328317
"col": 9
329-
}
318+
},
319+
"stale": false
330320
}
331321
],
332322
"notifications": []

‎tests/test-dirs/occurrences/project-wide/prefix.t/run.t‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -133,18 +133,6 @@ Merlin successfully finds occurrences outside file when UNIT_NAME directive is u
133133
"col": 19
134134
},
135135
"stale": false
136-
},
137-
{
138-
"file": "$TESTCASE_ROOT/b.ml",
139-
"start": {
140-
"line": 2,
141-
"col": 8
142-
},
143-
"end": {
144-
"line": 2,
145-
"col": 9
146-
},
147-
"stale": false
148136
}
149137
],
150138
"notifications": []
@@ -208,18 +196,6 @@ Merlin successfully finds occurrences outside file when WRAPPING_PREFIX directiv
208196
"col": 19
209197
},
210198
"stale": false
211-
},
212-
{
213-
"file": "$TESTCASE_ROOT/b.ml",
214-
"start": {
215-
"line": 2,
216-
"col": 8
217-
},
218-
"end": {
219-
"line": 2,
220-
"col": 9
221-
},
222-
"stale": false
223199
}
224200
],
225201
"notifications": []

‎tests/test-dirs/occurrences/project-wide/pwo-basic.t‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"file": "$TESTCASE_ROOT/main.ml",
3333
"start": {
3434
"line": 1,
35-
"col": 26
35+
"col": 22
3636
},
3737
"end": {
3838
"line": 1,
@@ -63,18 +63,6 @@
6363
"col": 25
6464
},
6565
"stale": false
66-
},
67-
{
68-
"file": "$TESTCASE_ROOT/main.ml",
69-
"start": {
70-
"line": 1,
71-
"col": 22
72-
},
73-
"end": {
74-
"line": 1,
75-
"col": 29
76-
},
77-
"stale": false
7866
}
7967
],
8068
"notifications": []

‎tests/test-dirs/occurrences/project-wide/stale-index.t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Foo was defined on line 2 when the index was built, but is now defined on line 1
2424
"file": "$TESTCASE_ROOT/main.ml",
2525
"start": {
2626
"line": 1,
27-
"col": 26
27+
"col": 22
2828
},
2929
"end": {
3030
"line": 1,

‎tests/test-dirs/parameters.t/run.t‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,10 @@ Check that we understand everything about [Basic[P:P_int].create]:
398398
}
399399
}
400400
{
401-
"file": "$TESTCASE_ROOT/basic.mli",
401+
"file": "$TESTCASE_ROOT/basic.ml",
402402
"pos": {
403-
"line": 7,
404-
"col": 0
403+
"line": 3,
404+
"col": 4
405405
}
406406
}
407407

@@ -426,10 +426,10 @@ syntax, so this output isn't ideal:
426426
}
427427
}
428428
{
429-
"file": "$TESTCASE_ROOT/fancy.mli",
429+
"file": "$TESTCASE_ROOT/fancy.ml",
430430
"pos": {
431-
"line": 4,
432-
"col": 0
431+
"line": 3,
432+
"col": 4
433433
}
434434
}
435435

@@ -442,7 +442,8 @@ Now let's see how instances work with aliases and includes:
442442

443443
Do we see where [Reexport_int.As_alias.create] comes from? (Note: It would be
444444
nice to delegate to [p.mli] here when there's no documentation for the
445-
implementing .mli.)
445+
implementing .mli.) (FIXME: Currently no. It should go to [p_int.ml]
446+
rather than [p.mli].)
446447

447448
$ multi_query_impl use_reexported_int.ml 3:37 $instance_warnings
448449
"unit -> Reexport_int.As_alias.t"
@@ -458,7 +459,7 @@ implementing .mli.)
458459
"file": "$TESTCASE_ROOT/p_int.mli",
459460
"pos": {
460461
"line": 3,
461-
"col": 0
462+
"col": 4
462463
}
463464
}
464465

0 commit comments

Comments
 (0)