Skip to content

Commit 8b115c4

Browse files
sparkprimesparkprime
committed
Make YAML output more canonical
1 parent 7fbd34a commit 8b115c4

8 files changed

+66
-65
lines changed

‎stdlib/std.jsonnet‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -923,9 +923,10 @@ limitations under the License.
923923
'[]'
924924
else
925925
local range = std.range(0, std.length(v) - 1);
926-
local new_indent = cindent + ' ';
927-
local parts = [aux(v[i], false, path + [i], new_indent) for i in range];
928-
(if in_object then '\n' + cindent else '') + '- ' + std.join('\n' + cindent + '- ', parts)
926+
local actual_indent = if in_object then cindent[2:] else cindent;
927+
local parts = [aux(v[i], false, path + [i], cindent) for i in range];
928+
(if in_object then '\n' + actual_indent else '')
929+
+ '- ' + std.join('\n' + actual_indent + '- ', parts)
929930
else if std.type(v) == 'object' then
930931
if std.length(v) == 0 then
931932
'{}'

‎test_suite/error.equality_function.jsonnet.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
RUNTIME ERROR: cannot test equality of functions
2-
std.jsonnet:1197:9-34 function <anonymous>
2+
std.jsonnet:1198:9-34 function <anonymous>
33
error.equality_function.jsonnet:17:1-33

‎test_suite/error.inside_equals_array.jsonnet.golden‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
RUNTIME ERROR: foobar
22
error.inside_equals_array.jsonnet:18:18-32 thunk <array_element>
3-
std.jsonnet:1177:29-33 thunk <b>
4-
std.jsonnet:1177:21-33 function <anonymous>
5-
std.jsonnet:1177:21-33 function <aux>
6-
std.jsonnet:1180:15-31 function <anonymous>
7-
std.jsonnet:1181:11-23
3+
std.jsonnet:1178:29-33 thunk <b>
4+
std.jsonnet:1178:21-33 function <anonymous>
5+
std.jsonnet:1178:21-33 function <aux>
6+
std.jsonnet:1181:15-31 function <anonymous>
7+
std.jsonnet:1182:11-23

‎test_suite/error.inside_equals_object.jsonnet.golden‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
RUNTIME ERROR: foobar
22
error.inside_equals_object.jsonnet:18:22-36 object <b>
3-
std.jsonnet:1191:50-54 thunk <b>
4-
std.jsonnet:1191:42-54 function <anonymous>
5-
std.jsonnet:1191:42-54 function <aux>
6-
std.jsonnet:1194:15-31 function <anonymous>
7-
std.jsonnet:1195:11-23
3+
std.jsonnet:1192:50-54 thunk <b>
4+
std.jsonnet:1192:42-54 function <anonymous>
5+
std.jsonnet:1192:42-54 function <aux>
6+
std.jsonnet:1195:15-31 function <anonymous>
7+
std.jsonnet:1196:11-23

‎test_suite/error.invariant.equality.jsonnet.golden‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RUNTIME ERROR: Object assertion failed.
22
error.invariant.equality.jsonnet:17:10-15 thunk <object_assert>
3-
std.jsonnet:1191:42-46 thunk <a>
4-
std.jsonnet:1191:42-54 function <anonymous>
5-
std.jsonnet:1191:42-54 function <anonymous>
6-
std.jsonnet:1195:11-23
3+
std.jsonnet:1192:42-46 thunk <a>
4+
std.jsonnet:1192:42-54 function <anonymous>
5+
std.jsonnet:1192:42-54 function <anonymous>
6+
std.jsonnet:1196:11-23

‎test_suite/error.obj_assert.fail1.jsonnet.golden‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RUNTIME ERROR: Object assertion failed.
22
error.obj_assert.fail1.jsonnet:20:23-29 thunk <object_assert>
3-
std.jsonnet:1191:42-46 thunk <a>
4-
std.jsonnet:1191:42-54 function <anonymous>
5-
std.jsonnet:1191:42-54 function <anonymous>
6-
std.jsonnet:1195:11-23
3+
std.jsonnet:1192:42-46 thunk <a>
4+
std.jsonnet:1192:42-54 function <anonymous>
5+
std.jsonnet:1192:42-54 function <anonymous>
6+
std.jsonnet:1196:11-23

‎test_suite/error.obj_assert.fail2.jsonnet.golden‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RUNTIME ERROR: foo was not equal to bar
22
error.obj_assert.fail2.jsonnet:20:32-65 thunk <object_assert>
3-
std.jsonnet:1191:42-46 thunk <a>
4-
std.jsonnet:1191:42-54 function <anonymous>
5-
std.jsonnet:1191:42-54 function <anonymous>
6-
std.jsonnet:1195:11-23
3+
std.jsonnet:1192:42-46 thunk <a>
4+
std.jsonnet:1192:42-54 function <anonymous>
5+
std.jsonnet:1192:42-54 function <anonymous>
6+
std.jsonnet:1196:11-23

‎test_suite/stdlib.jsonnet‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -457,27 +457,27 @@ std.assertEqual(
457457
|||
458458
"\"": null
459459
"arr":
460-
- - []
460+
- - []
461461
"emptyArray": []
462462
"emptyObject": {}
463463
"objectInArray":
464-
- "f": 3
464+
- "f": 3
465465
"x":
466-
- 1
467-
- 2
468-
- 3
469-
- true
470-
- false
471-
- null
472-
- |
473-
string
474-
string
466+
- 1
467+
- 2
468+
- 3
469+
- true
470+
- false
471+
- null
472+
- |
473+
string
474+
string
475475
"y":
476476
"a": 1
477477
"b": 2
478478
"c":
479-
- 1
480-
- 2
479+
- 1
480+
- 2
481481
|||
482482
) &&
483483

@@ -487,51 +487,51 @@ std.assertEqual(
487487
---
488488
"\"": null
489489
"arr":
490-
- - []
490+
- - []
491491
"emptyArray": []
492492
"emptyObject": {}
493493
"objectInArray":
494-
- "f": 3
494+
- "f": 3
495495
"x":
496-
- 1
497-
- 2
498-
- 3
499-
- true
500-
- false
501-
- null
502-
- |
503-
string
504-
string
496+
- 1
497+
- 2
498+
- 3
499+
- true
500+
- false
501+
- null
502+
- |
503+
string
504+
string
505505
"y":
506506
"a": 1
507507
"b": 2
508508
"c":
509-
- 1
510-
- 2
509+
- 1
510+
- 2
511511
---
512512
"\"": null
513513
"arr":
514-
- - []
514+
- - []
515515
"emptyArray": []
516516
"emptyObject": {}
517517
"objectInArray":
518-
- "f": 3
518+
- "f": 3
519519
"x":
520-
- 1
521-
- 2
522-
- 3
523-
- true
524-
- false
525-
- null
526-
- |
527-
string
528-
string
520+
- 1
521+
- 2
522+
- 3
523+
- true
524+
- false
525+
- null
526+
- |
527+
string
528+
string
529529
"y":
530530
"a": 1
531531
"b": 2
532532
"c":
533-
- 1
534-
- 2
533+
- 1
534+
- 2
535535
---
536536
{}
537537
---

0 commit comments

Comments
 (0)