diff --git a/extensions/default_unparsing_config.json b/extensions/default_unparsing_config.json index 19659301a..4f0b5817c 100644 --- a/extensions/default_unparsing_config.json +++ b/extensions/default_unparsing_config.json @@ -198,6 +198,36 @@ "whitespace" ] }, + "AspectAssoc": { + "node": { + "kind": "group", + "document": { + "kind": "align", + "width": 2, + "contents": [ + { + "kind": "recurse_field", + "field": "f_id" + }, + { + "kind": "recurse_field", + "field": "f_expr" + } + ] + } + }, + "fields": { + "f_expr": [ + "whitespace", + { + "kind": "text", + "text": "=>" + }, + "line", + "recurse" + ] + } + }, "ArrayTypeDef": { "node": { "kind": "group", diff --git a/testsuite/tests/unparsing/aspect_spec/multiple_long_aspects/doc-baseline.json b/testsuite/tests/unparsing/aspect_spec/multiple_long_aspects/doc-baseline.json index f6b8495ef..7269f1ce2 100644 --- a/testsuite/tests/unparsing/aspect_spec/multiple_long_aspects/doc-baseline.json +++ b/testsuite/tests/unparsing/aspect_spec/multiple_long_aspects/doc-baseline.json @@ -1,15 +1,15 @@ { - "id": 33, + "id": 44, "kind": "list", "list": [ { - "id": 21, + "id": 32, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 20, + "id": 31, "kind": "list", "list": [ { @@ -18,7 +18,7 @@ "text": "package Foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" }, { - "id": 17, + "id": 28, "kind": "command", "command": { "command": "align", @@ -27,7 +27,7 @@ "n": 2 }, "alignContents": { - "id": 16, + "id": 27, "kind": "list", "list": [ { @@ -54,13 +54,13 @@ ] }, { - "id": 15, + "id": 26, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 25, "kind": "list", "list": [ { @@ -69,7 +69,7 @@ "text": "with" }, { - "id": 13, + "id": 24, "kind": "command", "command": { "command": "align", @@ -78,13 +78,13 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 23, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 11, + "id": 22, "kind": "list", "list": [ { @@ -98,12 +98,44 @@ } }, { - "id": 6, + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 10, "kind": "text", - "text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar," + "text": "," }, { - "id": 7, + "id": 11, "kind": "command", "command": { "command": "line", @@ -113,12 +145,44 @@ } }, { - "id": 8, + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 13, + "kind": "list", + "list": [ + { + "id": 12, + "kind": "text", + "text": "Baz" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 16, "kind": "text", - "text": "Baz," + "text": "," }, { - "id": 9, + "id": 17, "kind": "command", "command": { "command": "line", @@ -128,9 +192,36 @@ } }, { - "id": 10, - "kind": "text", - "text": "Quuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuux" + "id": 21, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 20, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 19, + "kind": "list", + "list": [ + { + "id": 18, + "kind": "text", + "text": "Quuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuux" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -151,7 +242,7 @@ } }, { - "id": 18, + "id": 29, "kind": "command", "command": { "command": "line", @@ -161,7 +252,7 @@ } }, { - "id": 19, + "id": 30, "kind": "text", "text": "is" } @@ -172,26 +263,26 @@ } }, { - "id": 28, + "id": 39, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 27, + "id": 38, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 26, + "id": 37, "kind": "list", "list": [ { - "id": 24, + "id": 35, "kind": "list", "list": [ { - "id": 22, + "id": 33, "kind": "command", "command": { "command": "line", @@ -201,7 +292,7 @@ } }, { - "id": 23, + "id": 34, "kind": "command", "command": { "command": "breakParent" @@ -210,7 +301,7 @@ ] }, { - "id": 25, + "id": 36, "kind": "text", "text": "type Corge;" } @@ -223,11 +314,11 @@ } }, { - "id": 31, + "id": 42, "kind": "list", "list": [ { - "id": 29, + "id": 40, "kind": "command", "command": { "command": "line", @@ -237,7 +328,7 @@ } }, { - "id": 30, + "id": 41, "kind": "command", "command": { "command": "breakParent" @@ -246,7 +337,7 @@ ] }, { - "id": 32, + "id": 43, "kind": "text", "text": "end Foo;" } diff --git a/testsuite/tests/unparsing/aspect_spec/multiple_short_aspects/doc-baseline.json b/testsuite/tests/unparsing/aspect_spec/multiple_short_aspects/doc-baseline.json index 7f27e03be..2954787ce 100644 --- a/testsuite/tests/unparsing/aspect_spec/multiple_short_aspects/doc-baseline.json +++ b/testsuite/tests/unparsing/aspect_spec/multiple_short_aspects/doc-baseline.json @@ -1,15 +1,15 @@ { - "id": 31, + "id": 38, "kind": "list", "list": [ { - "id": 19, + "id": 26, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 18, + "id": 25, "kind": "list", "list": [ { @@ -18,7 +18,7 @@ "text": "package Foo" }, { - "id": 15, + "id": 22, "kind": "command", "command": { "command": "align", @@ -27,7 +27,7 @@ "n": 2 }, "alignContents": { - "id": 14, + "id": 21, "kind": "list", "list": [ { @@ -54,13 +54,13 @@ ] }, { - "id": 13, + "id": 20, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 12, + "id": 19, "kind": "list", "list": [ { @@ -69,7 +69,7 @@ "text": "with" }, { - "id": 11, + "id": 18, "kind": "command", "command": { "command": "align", @@ -78,13 +78,13 @@ "n": 2 }, "alignContents": { - "id": 10, + "id": 17, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 9, + "id": 16, "kind": "list", "list": [ { @@ -98,12 +98,44 @@ } }, { - "id": 6, + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Bar" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 10, "kind": "text", - "text": "Bar," + "text": "," }, { - "id": 7, + "id": 11, "kind": "command", "command": { "command": "line", @@ -113,9 +145,36 @@ } }, { - "id": 8, - "kind": "text", - "text": "Baz" + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 13, + "kind": "list", + "list": [ + { + "id": 12, + "kind": "text", + "text": "Baz" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -136,7 +195,7 @@ } }, { - "id": 16, + "id": 23, "kind": "command", "command": { "command": "line", @@ -146,7 +205,7 @@ } }, { - "id": 17, + "id": 24, "kind": "text", "text": "is" } @@ -157,26 +216,26 @@ } }, { - "id": 26, + "id": 33, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 25, + "id": 32, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 24, + "id": 31, "kind": "list", "list": [ { - "id": 22, + "id": 29, "kind": "list", "list": [ { - "id": 20, + "id": 27, "kind": "command", "command": { "command": "line", @@ -186,7 +245,7 @@ } }, { - "id": 21, + "id": 28, "kind": "command", "command": { "command": "breakParent" @@ -195,7 +254,7 @@ ] }, { - "id": 23, + "id": 30, "kind": "text", "text": "type Qux;" } @@ -208,11 +267,11 @@ } }, { - "id": 29, + "id": 36, "kind": "list", "list": [ { - "id": 27, + "id": 34, "kind": "command", "command": { "command": "line", @@ -222,7 +281,7 @@ } }, { - "id": 28, + "id": 35, "kind": "command", "command": { "command": "breakParent" @@ -231,7 +290,7 @@ ] }, { - "id": 30, + "id": 37, "kind": "text", "text": "end Foo;" } diff --git a/testsuite/tests/unparsing/aspect_spec/with_aspect_assoc/doc-baseline.json b/testsuite/tests/unparsing/aspect_spec/with_aspect_assoc/doc-baseline.json new file mode 100644 index 000000000..05a30694a --- /dev/null +++ b/testsuite/tests/unparsing/aspect_spec/with_aspect_assoc/doc-baseline.json @@ -0,0 +1,369 @@ +{ + "id": 47, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 46, + "kind": "list", + "list": [ + { + "id": 5, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "procedure Foo" + }, + { + "id": 2, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 1, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 8, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 7, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 29, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 28, + "kind": "list", + "list": [ + { + "id": 9, + "kind": "text", + "text": "with" + }, + { + "id": 27, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "list", + "list": [ + { + "id": 10, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 16, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 15, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 14, + "kind": "list", + "list": [ + { + "id": 11, + "kind": "text", + "text": "Pre =>" + }, + { + "id": 12, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 13, + "kind": "text", + "text": "Bar" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 17, + "kind": "text", + "text": "," + }, + { + "id": 18, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 23, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 22, + "kind": "list", + "list": [ + { + "id": 19, + "kind": "text", + "text": "Post =>" + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 21, + "kind": "text", + "text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 30, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 31, + "kind": "text", + "text": "is" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 32, + "kind": "list", + "list": [ + ] + } + } + }, + { + "id": 34, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 35, + "kind": "text", + "text": "begin" + }, + { + "id": 43, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 42, + "kind": "list", + "list": [ + { + "id": 41, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 40, + "kind": "list", + "list": [ + { + "id": 38, + "kind": "list", + "list": [ + { + "id": 36, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 37, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 39, + "kind": "text", + "text": "null;" + } + ] + } + } + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 45, + "kind": "text", + "text": "end Foo;" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/aspect_spec/with_aspect_assoc/input.ada b/testsuite/tests/unparsing/aspect_spec/with_aspect_assoc/input.ada new file mode 100644 index 000000000..ecb332038 --- /dev/null +++ b/testsuite/tests/unparsing/aspect_spec/with_aspect_assoc/input.ada @@ -0,0 +1,8 @@ +procedure Foo +with Pre=>Bar, Post=>Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz +is +begin + null; +end Foo; + + diff --git a/testsuite/tests/unparsing/aspect_spec/with_aspect_assoc/test.out b/testsuite/tests/unparsing/aspect_spec/with_aspect_assoc/test.out new file mode 100644 index 000000000..b87e16a1d --- /dev/null +++ b/testsuite/tests/unparsing/aspect_spec/with_aspect_assoc/test.out @@ -0,0 +1,9 @@ +procedure Foo +with + Pre => Bar, + Post => + Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz +is +begin + null; +end Foo; diff --git a/testsuite/tests/unparsing/aspect_spec/with_aspect_assoc/test.yaml b/testsuite/tests/unparsing/aspect_spec/with_aspect_assoc/test.yaml new file mode 100644 index 000000000..ddd64c6f1 --- /dev/null +++ b/testsuite/tests/unparsing/aspect_spec/with_aspect_assoc/test.yaml @@ -0,0 +1,5 @@ +driver: unparser +rule: subp_body +descrition: | + For a AspectAssoc, test: a whitespace before '=>'; line break or whitespace + after '=>'. diff --git a/testsuite/tests/unparsing/exception_decl/long_complete/doc-baseline.json b/testsuite/tests/unparsing/exception_decl/long_complete/doc-baseline.json index c18b85789..1218ee5bb 100644 --- a/testsuite/tests/unparsing/exception_decl/long_complete/doc-baseline.json +++ b/testsuite/tests/unparsing/exception_decl/long_complete/doc-baseline.json @@ -1,11 +1,11 @@ { - "id": 24, + "id": 27, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 23, + "id": 26, "kind": "list", "list": [ { @@ -113,19 +113,19 @@ } }, { - "id": 21, + "id": 24, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 20, + "id": 23, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 19, + "id": 22, "kind": "list", "list": [ { @@ -134,7 +134,7 @@ "text": "with" }, { - "id": 18, + "id": 21, "kind": "command", "command": { "command": "align", @@ -143,13 +143,13 @@ "n": 2 }, "alignContents": { - "id": 17, + "id": 20, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 16, + "id": 19, "kind": "list", "list": [ { @@ -163,9 +163,36 @@ } }, { - "id": 15, - "kind": "text", - "text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz" + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 16, + "kind": "list", + "list": [ + { + "id": 15, + "kind": "text", + "text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -186,7 +213,7 @@ } }, { - "id": 22, + "id": 25, "kind": "text", "text": ";" } diff --git a/testsuite/tests/unparsing/exception_decl/short_complete/doc-baseline.json b/testsuite/tests/unparsing/exception_decl/short_complete/doc-baseline.json index 67a8a09f1..fb0c92a18 100644 --- a/testsuite/tests/unparsing/exception_decl/short_complete/doc-baseline.json +++ b/testsuite/tests/unparsing/exception_decl/short_complete/doc-baseline.json @@ -1,11 +1,11 @@ { - "id": 24, + "id": 27, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 23, + "id": 26, "kind": "list", "list": [ { @@ -113,19 +113,19 @@ } }, { - "id": 21, + "id": 24, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 20, + "id": 23, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 19, + "id": 22, "kind": "list", "list": [ { @@ -134,7 +134,7 @@ "text": "with" }, { - "id": 18, + "id": 21, "kind": "command", "command": { "command": "align", @@ -143,13 +143,13 @@ "n": 2 }, "alignContents": { - "id": 17, + "id": 20, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 16, + "id": 19, "kind": "list", "list": [ { @@ -163,9 +163,36 @@ } }, { - "id": 15, - "kind": "text", - "text": "Baz" + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 16, + "kind": "list", + "list": [ + { + "id": 15, + "kind": "text", + "text": "Baz" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -186,7 +213,7 @@ } }, { - "id": 22, + "id": 25, "kind": "text", "text": ";" } diff --git a/testsuite/tests/unparsing/expr_function/everything_long/doc-baseline.json b/testsuite/tests/unparsing/expr_function/everything_long/doc-baseline.json index 3059c1d03..831e93420 100644 --- a/testsuite/tests/unparsing/expr_function/everything_long/doc-baseline.json +++ b/testsuite/tests/unparsing/expr_function/everything_long/doc-baseline.json @@ -1,626 +1,653 @@ -{ - "id": 78, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 77, - "kind": "list", - "list": [ - { - "id": 76, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 75, - "kind": "list", - "list": [ - { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - { - "id": 37, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 36, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 35, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foooooooooooooooooooooooooo" - }, - { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 27, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 26, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 25, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 23, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 24, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 32, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 29, - "kind": "text", - "text": "return Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 38, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 60, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 59, - "kind": "list", - "list": [ - { - "id": 39, - "kind": "text", - "text": "is " - }, - { - "id": 58, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 57, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 56, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 55, - "kind": "list", - "list": [ - { - "id": 40, - "kind": "text", - "text": "(" - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 47, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 46, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 45, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 44, - "kind": "list", - "list": [ - { - "id": 41, - "kind": "text", - "text": "B" - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": true, - "hard": false - } - }, - { - "id": 43, - "kind": "text", - "text": ".Garplyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 49, - "kind": "text", - "text": "/= " - }, - { - "id": 51, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 50, - "kind": "text", - "text": "nulllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll" - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 54, - "kind": "text", - "text": ")" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 65, - "kind": "list", - "list": [ - { - "id": 63, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 73, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 72, - "kind": "list", - "list": [ - { - "id": 66, - "kind": "text", - "text": "with" - }, - { - "id": 71, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "list", - "list": [ - { - "id": 67, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 68, - "kind": "text", - "text": "Freeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeed" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 74, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + { + "id": 37, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 36, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 35, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foooooooooooooooooooooooooo" + }, + { + "id": 34, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 33, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 27, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 26, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 25, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 23, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 24, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 32, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 29, + "kind": "text", + "text": "return Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 38, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 60, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 59, + "kind": "list", + "list": [ + { + "id": 39, + "kind": "text", + "text": "is " + }, + { + "id": 58, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 57, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 56, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 55, + "kind": "list", + "list": [ + { + "id": 40, + "kind": "text", + "text": "(" + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 47, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 46, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 45, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 44, + "kind": "list", + "list": [ + { + "id": 41, + "kind": "text", + "text": "B" + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": true, + "hard": false + } + }, + { + "id": 43, + "kind": "text", + "text": ".Garplyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 49, + "kind": "text", + "text": "/= " + }, + { + "id": 51, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 50, + "kind": "text", + "text": "nulllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll" + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 54, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 65, + "kind": "list", + "list": [ + { + "id": 63, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 76, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 75, + "kind": "list", + "list": [ + { + "id": 66, + "kind": "text", + "text": "with" + }, + { + "id": 74, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 73, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 72, + "kind": "list", + "list": [ + { + "id": 67, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 71, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 70, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 69, + "kind": "list", + "list": [ + { + "id": 68, + "kind": "text", + "text": "Freeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeed" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 77, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/expr_function/long_spec/doc-baseline.json b/testsuite/tests/unparsing/expr_function/long_spec/doc-baseline.json index 3968e8dc2..1c64f50b1 100644 --- a/testsuite/tests/unparsing/expr_function/long_spec/doc-baseline.json +++ b/testsuite/tests/unparsing/expr_function/long_spec/doc-baseline.json @@ -1,540 +1,540 @@ -{ - "id": 67, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 66, - "kind": "list", - "list": [ - { - "id": 65, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 64, - "kind": "list", - "list": [ - { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - { - "id": 37, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 36, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 35, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foooooooooooooooooooooooooo" - }, - { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 27, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 26, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 25, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 23, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 24, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 32, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 29, - "kind": "text", - "text": "return Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 38, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 60, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 59, - "kind": "list", - "list": [ - { - "id": 39, - "kind": "text", - "text": "is " - }, - { - "id": 58, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 57, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 56, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 55, - "kind": "list", - "list": [ - { - "id": 40, - "kind": "text", - "text": "(" - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 47, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 46, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 45, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 44, - "kind": "list", - "list": [ - { - "id": 41, - "kind": "text", - "text": "B" - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": true, - "hard": false - } - }, - { - "id": 43, - "kind": "text", - "text": ".Garply" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 49, - "kind": "text", - "text": "/= " - }, - { - "id": 51, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 50, - "kind": "text", - "text": "null" - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 54, - "kind": "text", - "text": ")" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 63, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } -} +{ + "id": 67, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 66, + "kind": "list", + "list": [ + { + "id": 65, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 64, + "kind": "list", + "list": [ + { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + { + "id": 37, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 36, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 35, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foooooooooooooooooooooooooo" + }, + { + "id": 34, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 33, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 27, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 26, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 25, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 23, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 24, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 32, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 29, + "kind": "text", + "text": "return Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 38, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 60, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 59, + "kind": "list", + "list": [ + { + "id": 39, + "kind": "text", + "text": "is " + }, + { + "id": 58, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 57, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 56, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 55, + "kind": "list", + "list": [ + { + "id": 40, + "kind": "text", + "text": "(" + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 47, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 46, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 45, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 44, + "kind": "list", + "list": [ + { + "id": 41, + "kind": "text", + "text": "B" + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": true, + "hard": false + } + }, + { + "id": 43, + "kind": "text", + "text": ".Garply" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 49, + "kind": "text", + "text": "/= " + }, + { + "id": 51, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 50, + "kind": "text", + "text": "null" + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 54, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 63, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/expr_function/long_spec_with_aspect/doc-baseline.json b/testsuite/tests/unparsing/expr_function/long_spec_with_aspect/doc-baseline.json index 6ef75990b..33ff10798 100644 --- a/testsuite/tests/unparsing/expr_function/long_spec_with_aspect/doc-baseline.json +++ b/testsuite/tests/unparsing/expr_function/long_spec_with_aspect/doc-baseline.json @@ -1,626 +1,653 @@ -{ - "id": 78, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 77, - "kind": "list", - "list": [ - { - "id": 76, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 75, - "kind": "list", - "list": [ - { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - { - "id": 37, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 36, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 35, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foooooooooooooooooooooooooo" - }, - { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 27, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 26, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 25, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 23, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 24, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 32, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 29, - "kind": "text", - "text": "return Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 38, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 60, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 59, - "kind": "list", - "list": [ - { - "id": 39, - "kind": "text", - "text": "is " - }, - { - "id": 58, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 57, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 56, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 55, - "kind": "list", - "list": [ - { - "id": 40, - "kind": "text", - "text": "(" - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 47, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 46, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 45, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 44, - "kind": "list", - "list": [ - { - "id": 41, - "kind": "text", - "text": "B" - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": true, - "hard": false - } - }, - { - "id": 43, - "kind": "text", - "text": ".Garplyy" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 49, - "kind": "text", - "text": "/= " - }, - { - "id": 51, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 50, - "kind": "text", - "text": "null" - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 54, - "kind": "text", - "text": ")" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 65, - "kind": "list", - "list": [ - { - "id": 63, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 73, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 72, - "kind": "list", - "list": [ - { - "id": 66, - "kind": "text", - "text": "with" - }, - { - "id": 71, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "list", - "list": [ - { - "id": 67, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 68, - "kind": "text", - "text": "Freeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeed" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 74, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + { + "id": 37, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 36, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 35, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foooooooooooooooooooooooooo" + }, + { + "id": 34, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 33, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 27, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 26, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 25, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 23, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 24, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 32, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 29, + "kind": "text", + "text": "return Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 38, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 60, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 59, + "kind": "list", + "list": [ + { + "id": 39, + "kind": "text", + "text": "is " + }, + { + "id": 58, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 57, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 56, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 55, + "kind": "list", + "list": [ + { + "id": 40, + "kind": "text", + "text": "(" + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 47, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 46, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 45, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 44, + "kind": "list", + "list": [ + { + "id": 41, + "kind": "text", + "text": "B" + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": true, + "hard": false + } + }, + { + "id": 43, + "kind": "text", + "text": ".Garplyy" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 49, + "kind": "text", + "text": "/= " + }, + { + "id": 51, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 50, + "kind": "text", + "text": "null" + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 54, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 65, + "kind": "list", + "list": [ + { + "id": 63, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 76, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 75, + "kind": "list", + "list": [ + { + "id": 66, + "kind": "text", + "text": "with" + }, + { + "id": 74, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 73, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 72, + "kind": "list", + "list": [ + { + "id": 67, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 71, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 70, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 69, + "kind": "list", + "list": [ + { + "id": 68, + "kind": "text", + "text": "Freeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeed" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 77, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/expr_function/short/doc-baseline.json b/testsuite/tests/unparsing/expr_function/short/doc-baseline.json index ee53861ae..f96379f32 100644 --- a/testsuite/tests/unparsing/expr_function/short/doc-baseline.json +++ b/testsuite/tests/unparsing/expr_function/short/doc-baseline.json @@ -1,540 +1,540 @@ -{ - "id": 67, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 66, - "kind": "list", - "list": [ - { - "id": 65, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 64, - "kind": "list", - "list": [ - { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - { - "id": 37, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 36, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 35, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 27, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 26, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 25, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 23, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 24, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 32, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 29, - "kind": "text", - "text": "return Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 38, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 60, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 59, - "kind": "list", - "list": [ - { - "id": 39, - "kind": "text", - "text": "is " - }, - { - "id": 58, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 57, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 56, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 55, - "kind": "list", - "list": [ - { - "id": 40, - "kind": "text", - "text": "(" - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 47, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 46, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 45, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 44, - "kind": "list", - "list": [ - { - "id": 41, - "kind": "text", - "text": "B" - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": true, - "hard": false - } - }, - { - "id": 43, - "kind": "text", - "text": ".Garply" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 49, - "kind": "text", - "text": "/= " - }, - { - "id": 51, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 50, - "kind": "text", - "text": "null" - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 54, - "kind": "text", - "text": ")" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 63, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } -} +{ + "id": 67, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 66, + "kind": "list", + "list": [ + { + "id": 65, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 64, + "kind": "list", + "list": [ + { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + { + "id": 37, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 36, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 35, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foo" + }, + { + "id": 34, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 33, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 27, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 26, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 25, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 23, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 24, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 32, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 29, + "kind": "text", + "text": "return Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 38, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 60, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 59, + "kind": "list", + "list": [ + { + "id": 39, + "kind": "text", + "text": "is " + }, + { + "id": 58, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 57, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 56, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 55, + "kind": "list", + "list": [ + { + "id": 40, + "kind": "text", + "text": "(" + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 47, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 46, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 45, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 44, + "kind": "list", + "list": [ + { + "id": 41, + "kind": "text", + "text": "B" + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": true, + "hard": false + } + }, + { + "id": 43, + "kind": "text", + "text": ".Garply" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 49, + "kind": "text", + "text": "/= " + }, + { + "id": 51, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 50, + "kind": "text", + "text": "null" + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 54, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 63, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/expr_function/short_with_aspect/doc-baseline.json b/testsuite/tests/unparsing/expr_function/short_with_aspect/doc-baseline.json index 441ca782a..b401672f1 100644 --- a/testsuite/tests/unparsing/expr_function/short_with_aspect/doc-baseline.json +++ b/testsuite/tests/unparsing/expr_function/short_with_aspect/doc-baseline.json @@ -1,626 +1,653 @@ -{ - "id": 78, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 77, - "kind": "list", - "list": [ - { - "id": 76, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 75, - "kind": "list", - "list": [ - { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - { - "id": 37, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 36, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 35, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 27, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 26, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 25, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 23, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 24, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 32, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 29, - "kind": "text", - "text": "return Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 38, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 60, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 59, - "kind": "list", - "list": [ - { - "id": 39, - "kind": "text", - "text": "is " - }, - { - "id": 58, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 57, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 56, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 55, - "kind": "list", - "list": [ - { - "id": 40, - "kind": "text", - "text": "(" - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 47, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 46, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 45, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 44, - "kind": "list", - "list": [ - { - "id": 41, - "kind": "text", - "text": "B" - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": true, - "hard": false - } - }, - { - "id": 43, - "kind": "text", - "text": ".Garply" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 49, - "kind": "text", - "text": "/= " - }, - { - "id": 51, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 50, - "kind": "text", - "text": "null" - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 54, - "kind": "text", - "text": ")" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 65, - "kind": "list", - "list": [ - { - "id": 63, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 73, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 72, - "kind": "list", - "list": [ - { - "id": 66, - "kind": "text", - "text": "with" - }, - { - "id": 71, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "list", - "list": [ - { - "id": 67, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 68, - "kind": "text", - "text": "Freeeeeeeeeeeeeed" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 74, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + { + "id": 37, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 36, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 35, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foo" + }, + { + "id": 34, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 33, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 27, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 26, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 25, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 23, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 24, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 32, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 29, + "kind": "text", + "text": "return Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 38, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 60, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 59, + "kind": "list", + "list": [ + { + "id": 39, + "kind": "text", + "text": "is " + }, + { + "id": 58, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 57, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 56, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 55, + "kind": "list", + "list": [ + { + "id": 40, + "kind": "text", + "text": "(" + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 47, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 46, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 45, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 44, + "kind": "list", + "list": [ + { + "id": 41, + "kind": "text", + "text": "B" + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": true, + "hard": false + } + }, + { + "id": 43, + "kind": "text", + "text": ".Garply" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 49, + "kind": "text", + "text": "/= " + }, + { + "id": 51, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 50, + "kind": "text", + "text": "null" + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 54, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 65, + "kind": "list", + "list": [ + { + "id": 63, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 76, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 75, + "kind": "list", + "list": [ + { + "id": 66, + "kind": "text", + "text": "with" + }, + { + "id": 74, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 73, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 72, + "kind": "list", + "list": [ + { + "id": 67, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 71, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 70, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 69, + "kind": "list", + "list": [ + { + "id": 68, + "kind": "text", + "text": "Freeeeeeeeeeeeeed" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 77, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/generic_package_renaming_decl/long_with_aspect/doc-baseline.json b/testsuite/tests/unparsing/generic_package_renaming_decl/long_with_aspect/doc-baseline.json index 45e7c24be..9b4ed8576 100644 --- a/testsuite/tests/unparsing/generic_package_renaming_decl/long_with_aspect/doc-baseline.json +++ b/testsuite/tests/unparsing/generic_package_renaming_decl/long_with_aspect/doc-baseline.json @@ -1,11 +1,11 @@ { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 15, + "id": 18, "kind": "list", "list": [ { @@ -14,7 +14,7 @@ "text": "generic package Foo" }, { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -23,7 +23,7 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "list", "list": [ { @@ -52,13 +52,13 @@ } }, { - "id": 11, + "id": 14, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 10, + "id": 13, "kind": "list", "list": [ { @@ -67,7 +67,7 @@ "text": "with" }, { - "id": 9, + "id": 12, "kind": "command", "command": { "command": "align", @@ -76,13 +76,13 @@ "n": 2 }, "alignContents": { - "id": 8, + "id": 11, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 7, + "id": 10, "kind": "list", "list": [ { @@ -96,9 +96,36 @@ } }, { - "id": 6, - "kind": "text", - "text": "Baz" + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Baz" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -119,7 +146,7 @@ } }, { - "id": 14, + "id": 17, "kind": "text", "text": ";" } diff --git a/testsuite/tests/unparsing/generic_package_renaming_decl/short_with_aspect/doc-baseline.json b/testsuite/tests/unparsing/generic_package_renaming_decl/short_with_aspect/doc-baseline.json index df6e2b431..6ddf66302 100644 --- a/testsuite/tests/unparsing/generic_package_renaming_decl/short_with_aspect/doc-baseline.json +++ b/testsuite/tests/unparsing/generic_package_renaming_decl/short_with_aspect/doc-baseline.json @@ -1,11 +1,11 @@ { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 15, + "id": 18, "kind": "list", "list": [ { @@ -14,7 +14,7 @@ "text": "generic package Foo" }, { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -23,7 +23,7 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "list", "list": [ { @@ -52,13 +52,13 @@ } }, { - "id": 11, + "id": 14, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 10, + "id": 13, "kind": "list", "list": [ { @@ -67,7 +67,7 @@ "text": "with" }, { - "id": 9, + "id": 12, "kind": "command", "command": { "command": "align", @@ -76,13 +76,13 @@ "n": 2 }, "alignContents": { - "id": 8, + "id": 11, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 7, + "id": 10, "kind": "list", "list": [ { @@ -96,9 +96,36 @@ } }, { - "id": 6, - "kind": "text", - "text": "Baz" + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Baz" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -119,7 +146,7 @@ } }, { - "id": 14, + "id": 17, "kind": "text", "text": ";" } diff --git a/testsuite/tests/unparsing/generic_subp_renaming_decl/long_with_aspect/doc-baseline.json b/testsuite/tests/unparsing/generic_subp_renaming_decl/long_with_aspect/doc-baseline.json index 383d45f92..4aa653b70 100644 --- a/testsuite/tests/unparsing/generic_subp_renaming_decl/long_with_aspect/doc-baseline.json +++ b/testsuite/tests/unparsing/generic_subp_renaming_decl/long_with_aspect/doc-baseline.json @@ -1,11 +1,11 @@ { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 15, + "id": 18, "kind": "list", "list": [ { @@ -14,7 +14,7 @@ "text": "generic procedure Foo" }, { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -23,7 +23,7 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "list", "list": [ { @@ -52,13 +52,13 @@ } }, { - "id": 11, + "id": 14, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 10, + "id": 13, "kind": "list", "list": [ { @@ -67,7 +67,7 @@ "text": "with" }, { - "id": 9, + "id": 12, "kind": "command", "command": { "command": "align", @@ -76,13 +76,13 @@ "n": 2 }, "alignContents": { - "id": 8, + "id": 11, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 7, + "id": 10, "kind": "list", "list": [ { @@ -96,9 +96,36 @@ } }, { - "id": 6, - "kind": "text", - "text": "Baz" + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Baz" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -119,7 +146,7 @@ } }, { - "id": 14, + "id": 17, "kind": "text", "text": ";" } diff --git a/testsuite/tests/unparsing/generic_subp_renaming_decl/short_with_aspect/doc-baseline.json b/testsuite/tests/unparsing/generic_subp_renaming_decl/short_with_aspect/doc-baseline.json index 61b099108..ea68a99a7 100644 --- a/testsuite/tests/unparsing/generic_subp_renaming_decl/short_with_aspect/doc-baseline.json +++ b/testsuite/tests/unparsing/generic_subp_renaming_decl/short_with_aspect/doc-baseline.json @@ -1,11 +1,11 @@ { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 15, + "id": 18, "kind": "list", "list": [ { @@ -14,7 +14,7 @@ "text": "generic procedure Foo" }, { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -23,7 +23,7 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "list", "list": [ { @@ -52,13 +52,13 @@ } }, { - "id": 11, + "id": 14, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 10, + "id": 13, "kind": "list", "list": [ { @@ -67,7 +67,7 @@ "text": "with" }, { - "id": 9, + "id": 12, "kind": "command", "command": { "command": "align", @@ -76,13 +76,13 @@ "n": 2 }, "alignContents": { - "id": 8, + "id": 11, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 7, + "id": 10, "kind": "list", "list": [ { @@ -96,9 +96,36 @@ } }, { - "id": 6, - "kind": "text", - "text": "Baz" + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Baz" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -119,7 +146,7 @@ } }, { - "id": 14, + "id": 17, "kind": "text", "text": ";" } diff --git a/testsuite/tests/unparsing/null_subp_decl/short_with_aspects/doc-baseline.json b/testsuite/tests/unparsing/null_subp_decl/short_with_aspects/doc-baseline.json index 5d228083d..881c8df64 100644 --- a/testsuite/tests/unparsing/null_subp_decl/short_with_aspects/doc-baseline.json +++ b/testsuite/tests/unparsing/null_subp_decl/short_with_aspects/doc-baseline.json @@ -1,11 +1,11 @@ { - "id": 113, + "id": 116, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 112, + "id": 115, "kind": "list", "list": [ { @@ -838,13 +838,13 @@ } }, { - "id": 110, + "id": 113, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 109, + "id": 112, "kind": "list", "list": [ { @@ -853,7 +853,7 @@ "text": "with" }, { - "id": 108, + "id": 111, "kind": "command", "command": { "command": "align", @@ -862,13 +862,13 @@ "n": 2 }, "alignContents": { - "id": 107, + "id": 110, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 106, + "id": 109, "kind": "list", "list": [ { @@ -882,9 +882,36 @@ } }, { - "id": 105, - "kind": "text", - "text": "Garplyyyyyyy" + "id": 108, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 107, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 106, + "kind": "list", + "list": [ + { + "id": 105, + "kind": "text", + "text": "Garplyyyyyyy" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -901,7 +928,7 @@ } }, { - "id": 111, + "id": 114, "kind": "text", "text": ";" } diff --git a/testsuite/tests/unparsing/package_body/short_names_w_stmts/doc-baseline.json b/testsuite/tests/unparsing/package_body/short_names_w_stmts/doc-baseline.json index d7822eb53..09b535b56 100644 --- a/testsuite/tests/unparsing/package_body/short_names_w_stmts/doc-baseline.json +++ b/testsuite/tests/unparsing/package_body/short_names_w_stmts/doc-baseline.json @@ -1,15 +1,15 @@ { - "id": 41, + "id": 44, "kind": "list", "list": [ { - "id": 17, + "id": 20, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 16, + "id": 19, "kind": "list", "list": [ { @@ -18,7 +18,7 @@ "text": "package body Foo" }, { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -27,7 +27,7 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "list", "list": [ { @@ -54,13 +54,13 @@ ] }, { - "id": 11, + "id": 14, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 10, + "id": 13, "kind": "list", "list": [ { @@ -69,7 +69,7 @@ "text": "with" }, { - "id": 9, + "id": 12, "kind": "command", "command": { "command": "align", @@ -78,13 +78,13 @@ "n": 2 }, "alignContents": { - "id": 8, + "id": 11, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 7, + "id": 10, "kind": "list", "list": [ { @@ -98,9 +98,36 @@ } }, { - "id": 6, - "kind": "text", - "text": "Bar" + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Bar" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -121,7 +148,7 @@ } }, { - "id": 14, + "id": 17, "kind": "command", "command": { "command": "line", @@ -131,7 +158,7 @@ } }, { - "id": 15, + "id": 18, "kind": "text", "text": "is" } @@ -142,26 +169,26 @@ } }, { - "id": 24, + "id": 27, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 23, + "id": 26, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 22, + "id": 25, "kind": "list", "list": [ { - "id": 20, + "id": 23, "kind": "list", "list": [ { - "id": 18, + "id": 21, "kind": "command", "command": { "command": "line", @@ -171,7 +198,7 @@ } }, { - "id": 19, + "id": 22, "kind": "command", "command": { "command": "breakParent" @@ -180,7 +207,7 @@ ] }, { - "id": 21, + "id": 24, "kind": "text", "text": "type Baz;" } @@ -193,11 +220,11 @@ } }, { - "id": 27, + "id": 30, "kind": "list", "list": [ { - "id": 25, + "id": 28, "kind": "command", "command": { "command": "line", @@ -207,7 +234,7 @@ } }, { - "id": 26, + "id": 29, "kind": "command", "command": { "command": "breakParent" @@ -216,35 +243,35 @@ ] }, { - "id": 28, + "id": 31, "kind": "text", "text": "begin" }, { - "id": 36, + "id": 39, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 35, + "id": 38, "kind": "list", "list": [ { - "id": 34, + "id": 37, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 33, + "id": 36, "kind": "list", "list": [ { - "id": 31, + "id": 34, "kind": "list", "list": [ { - "id": 29, + "id": 32, "kind": "command", "command": { "command": "line", @@ -254,7 +281,7 @@ } }, { - "id": 30, + "id": 33, "kind": "command", "command": { "command": "breakParent" @@ -263,7 +290,7 @@ ] }, { - "id": 32, + "id": 35, "kind": "text", "text": "null;" } @@ -278,11 +305,11 @@ } }, { - "id": 39, + "id": 42, "kind": "list", "list": [ { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "line", @@ -292,7 +319,7 @@ } }, { - "id": 38, + "id": 41, "kind": "command", "command": { "command": "breakParent" @@ -301,7 +328,7 @@ ] }, { - "id": 40, + "id": 43, "kind": "text", "text": "end Foo;" } diff --git a/testsuite/tests/unparsing/package_body/short_names_wo_stmts/doc-baseline.json b/testsuite/tests/unparsing/package_body/short_names_wo_stmts/doc-baseline.json index 643a77297..aecc72b27 100644 --- a/testsuite/tests/unparsing/package_body/short_names_wo_stmts/doc-baseline.json +++ b/testsuite/tests/unparsing/package_body/short_names_wo_stmts/doc-baseline.json @@ -1,15 +1,15 @@ { - "id": 29, + "id": 32, "kind": "list", "list": [ { - "id": 17, + "id": 20, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 16, + "id": 19, "kind": "list", "list": [ { @@ -18,7 +18,7 @@ "text": "package body Foo" }, { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -27,7 +27,7 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "list", "list": [ { @@ -54,13 +54,13 @@ ] }, { - "id": 11, + "id": 14, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 10, + "id": 13, "kind": "list", "list": [ { @@ -69,7 +69,7 @@ "text": "with" }, { - "id": 9, + "id": 12, "kind": "command", "command": { "command": "align", @@ -78,13 +78,13 @@ "n": 2 }, "alignContents": { - "id": 8, + "id": 11, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 7, + "id": 10, "kind": "list", "list": [ { @@ -98,9 +98,36 @@ } }, { - "id": 6, - "kind": "text", - "text": "Bar" + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Bar" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -121,7 +148,7 @@ } }, { - "id": 14, + "id": 17, "kind": "command", "command": { "command": "line", @@ -131,7 +158,7 @@ } }, { - "id": 15, + "id": 18, "kind": "text", "text": "is" } @@ -142,26 +169,26 @@ } }, { - "id": 24, + "id": 27, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 23, + "id": 26, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 22, + "id": 25, "kind": "list", "list": [ { - "id": 20, + "id": 23, "kind": "list", "list": [ { - "id": 18, + "id": 21, "kind": "command", "command": { "command": "line", @@ -171,7 +198,7 @@ } }, { - "id": 19, + "id": 22, "kind": "command", "command": { "command": "breakParent" @@ -180,7 +207,7 @@ ] }, { - "id": 21, + "id": 24, "kind": "text", "text": "type Baz;" } @@ -193,11 +220,11 @@ } }, { - "id": 27, + "id": 30, "kind": "list", "list": [ { - "id": 25, + "id": 28, "kind": "command", "command": { "command": "line", @@ -207,7 +234,7 @@ } }, { - "id": 26, + "id": 29, "kind": "command", "command": { "command": "breakParent" @@ -216,7 +243,7 @@ ] }, { - "id": 28, + "id": 31, "kind": "text", "text": "end Foo;" } diff --git a/testsuite/tests/unparsing/package_body_stub/long/doc-baseline.json b/testsuite/tests/unparsing/package_body_stub/long/doc-baseline.json index 8a6496cd0..9689e18c0 100644 --- a/testsuite/tests/unparsing/package_body_stub/long/doc-baseline.json +++ b/testsuite/tests/unparsing/package_body_stub/long/doc-baseline.json @@ -1,11 +1,11 @@ { - "id": 25, + "id": 28, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 24, + "id": 27, "kind": "list", "list": [ { @@ -127,13 +127,13 @@ } }, { - "id": 22, + "id": 25, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 21, + "id": 24, "kind": "list", "list": [ { @@ -142,7 +142,7 @@ "text": "with" }, { - "id": 20, + "id": 23, "kind": "command", "command": { "command": "align", @@ -151,13 +151,13 @@ "n": 2 }, "alignContents": { - "id": 19, + "id": 22, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 18, + "id": 21, "kind": "list", "list": [ { @@ -171,9 +171,36 @@ } }, { - "id": 17, - "kind": "text", - "text": "Garply" + "id": 20, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "list", + "list": [ + { + "id": 17, + "kind": "text", + "text": "Garply" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -190,7 +217,7 @@ } }, { - "id": 23, + "id": 26, "kind": "text", "text": ";" } diff --git a/testsuite/tests/unparsing/package_decl/long_aspect/doc-baseline.json b/testsuite/tests/unparsing/package_decl/long_aspect/doc-baseline.json index f591edde3..b0ecbaa6c 100644 --- a/testsuite/tests/unparsing/package_decl/long_aspect/doc-baseline.json +++ b/testsuite/tests/unparsing/package_decl/long_aspect/doc-baseline.json @@ -1,15 +1,15 @@ { - "id": 40, + "id": 43, "kind": "list", "list": [ { - "id": 17, + "id": 20, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 16, + "id": 19, "kind": "list", "list": [ { @@ -18,7 +18,7 @@ "text": "package Foo" }, { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -27,7 +27,7 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "list", "list": [ { @@ -54,13 +54,13 @@ ] }, { - "id": 11, + "id": 14, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 10, + "id": 13, "kind": "list", "list": [ { @@ -69,7 +69,7 @@ "text": "with" }, { - "id": 9, + "id": 12, "kind": "command", "command": { "command": "align", @@ -78,13 +78,13 @@ "n": 2 }, "alignContents": { - "id": 8, + "id": 11, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 7, + "id": 10, "kind": "list", "list": [ { @@ -98,9 +98,36 @@ } }, { - "id": 6, - "kind": "text", - "text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar" + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -121,7 +148,7 @@ } }, { - "id": 14, + "id": 17, "kind": "command", "command": { "command": "line", @@ -131,7 +158,7 @@ } }, { - "id": 15, + "id": 18, "kind": "text", "text": "is" } @@ -142,26 +169,26 @@ } }, { - "id": 24, + "id": 27, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 23, + "id": 26, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 22, + "id": 25, "kind": "list", "list": [ { - "id": 20, + "id": 23, "kind": "list", "list": [ { - "id": 18, + "id": 21, "kind": "command", "command": { "command": "line", @@ -171,7 +198,7 @@ } }, { - "id": 19, + "id": 22, "kind": "command", "command": { "command": "breakParent" @@ -180,7 +207,7 @@ ] }, { - "id": 21, + "id": 24, "kind": "text", "text": "type Baz;" } @@ -193,11 +220,11 @@ } }, { - "id": 27, + "id": 30, "kind": "list", "list": [ { - "id": 25, + "id": 28, "kind": "command", "command": { "command": "line", @@ -207,7 +234,7 @@ } }, { - "id": 26, + "id": 29, "kind": "command", "command": { "command": "breakParent" @@ -216,31 +243,31 @@ ] }, { - "id": 28, + "id": 31, "kind": "text", "text": "private" }, { - "id": 35, + "id": 38, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 34, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 33, + "id": 36, "kind": "list", "list": [ { - "id": 31, + "id": 34, "kind": "list", "list": [ { - "id": 29, + "id": 32, "kind": "command", "command": { "command": "line", @@ -250,7 +277,7 @@ } }, { - "id": 30, + "id": 33, "kind": "command", "command": { "command": "breakParent" @@ -259,7 +286,7 @@ ] }, { - "id": 32, + "id": 35, "kind": "text", "text": "type Qux;" } @@ -272,11 +299,11 @@ } }, { - "id": 38, + "id": 41, "kind": "list", "list": [ { - "id": 36, + "id": 39, "kind": "command", "command": { "command": "line", @@ -286,7 +313,7 @@ } }, { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "breakParent" @@ -295,7 +322,7 @@ ] }, { - "id": 39, + "id": 42, "kind": "text", "text": "end Foo;" } diff --git a/testsuite/tests/unparsing/package_decl/long_name/doc-baseline.json b/testsuite/tests/unparsing/package_decl/long_name/doc-baseline.json index 1442f7425..6a0ab5f65 100644 --- a/testsuite/tests/unparsing/package_decl/long_name/doc-baseline.json +++ b/testsuite/tests/unparsing/package_decl/long_name/doc-baseline.json @@ -1,15 +1,15 @@ { - "id": 40, + "id": 43, "kind": "list", "list": [ { - "id": 17, + "id": 20, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 16, + "id": 19, "kind": "list", "list": [ { @@ -18,7 +18,7 @@ "text": "package Foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" }, { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -27,7 +27,7 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "list", "list": [ { @@ -54,13 +54,13 @@ ] }, { - "id": 11, + "id": 14, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 10, + "id": 13, "kind": "list", "list": [ { @@ -69,7 +69,7 @@ "text": "with" }, { - "id": 9, + "id": 12, "kind": "command", "command": { "command": "align", @@ -78,13 +78,13 @@ "n": 2 }, "alignContents": { - "id": 8, + "id": 11, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 7, + "id": 10, "kind": "list", "list": [ { @@ -98,9 +98,36 @@ } }, { - "id": 6, - "kind": "text", - "text": "Bar" + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Bar" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -121,7 +148,7 @@ } }, { - "id": 14, + "id": 17, "kind": "command", "command": { "command": "line", @@ -131,7 +158,7 @@ } }, { - "id": 15, + "id": 18, "kind": "text", "text": "is" } @@ -142,26 +169,26 @@ } }, { - "id": 24, + "id": 27, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 23, + "id": 26, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 22, + "id": 25, "kind": "list", "list": [ { - "id": 20, + "id": 23, "kind": "list", "list": [ { - "id": 18, + "id": 21, "kind": "command", "command": { "command": "line", @@ -171,7 +198,7 @@ } }, { - "id": 19, + "id": 22, "kind": "command", "command": { "command": "breakParent" @@ -180,7 +207,7 @@ ] }, { - "id": 21, + "id": 24, "kind": "text", "text": "type Baz;" } @@ -193,11 +220,11 @@ } }, { - "id": 27, + "id": 30, "kind": "list", "list": [ { - "id": 25, + "id": 28, "kind": "command", "command": { "command": "line", @@ -207,7 +234,7 @@ } }, { - "id": 26, + "id": 29, "kind": "command", "command": { "command": "breakParent" @@ -216,31 +243,31 @@ ] }, { - "id": 28, + "id": 31, "kind": "text", "text": "private" }, { - "id": 35, + "id": 38, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 34, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 33, + "id": 36, "kind": "list", "list": [ { - "id": 31, + "id": 34, "kind": "list", "list": [ { - "id": 29, + "id": 32, "kind": "command", "command": { "command": "line", @@ -250,7 +277,7 @@ } }, { - "id": 30, + "id": 33, "kind": "command", "command": { "command": "breakParent" @@ -259,7 +286,7 @@ ] }, { - "id": 32, + "id": 35, "kind": "text", "text": "type Qux;" } @@ -272,11 +299,11 @@ } }, { - "id": 38, + "id": 41, "kind": "list", "list": [ { - "id": 36, + "id": 39, "kind": "command", "command": { "command": "line", @@ -286,7 +313,7 @@ } }, { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "breakParent" @@ -295,7 +322,7 @@ ] }, { - "id": 39, + "id": 42, "kind": "text", "text": "end Foo;" } diff --git a/testsuite/tests/unparsing/package_decl/long_name_and_aspect/doc-baseline.json b/testsuite/tests/unparsing/package_decl/long_name_and_aspect/doc-baseline.json index bdfcca9bb..88721bd64 100644 --- a/testsuite/tests/unparsing/package_decl/long_name_and_aspect/doc-baseline.json +++ b/testsuite/tests/unparsing/package_decl/long_name_and_aspect/doc-baseline.json @@ -1,15 +1,15 @@ { - "id": 40, + "id": 43, "kind": "list", "list": [ { - "id": 17, + "id": 20, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 16, + "id": 19, "kind": "list", "list": [ { @@ -18,7 +18,7 @@ "text": "package Foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" }, { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -27,7 +27,7 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "list", "list": [ { @@ -54,13 +54,13 @@ ] }, { - "id": 11, + "id": 14, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 10, + "id": 13, "kind": "list", "list": [ { @@ -69,7 +69,7 @@ "text": "with" }, { - "id": 9, + "id": 12, "kind": "command", "command": { "command": "align", @@ -78,13 +78,13 @@ "n": 2 }, "alignContents": { - "id": 8, + "id": 11, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 7, + "id": 10, "kind": "list", "list": [ { @@ -98,9 +98,36 @@ } }, { - "id": 6, - "kind": "text", - "text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar" + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -121,7 +148,7 @@ } }, { - "id": 14, + "id": 17, "kind": "command", "command": { "command": "line", @@ -131,7 +158,7 @@ } }, { - "id": 15, + "id": 18, "kind": "text", "text": "is" } @@ -142,26 +169,26 @@ } }, { - "id": 24, + "id": 27, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 23, + "id": 26, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 22, + "id": 25, "kind": "list", "list": [ { - "id": 20, + "id": 23, "kind": "list", "list": [ { - "id": 18, + "id": 21, "kind": "command", "command": { "command": "line", @@ -171,7 +198,7 @@ } }, { - "id": 19, + "id": 22, "kind": "command", "command": { "command": "breakParent" @@ -180,7 +207,7 @@ ] }, { - "id": 21, + "id": 24, "kind": "text", "text": "type Baz;" } @@ -193,11 +220,11 @@ } }, { - "id": 27, + "id": 30, "kind": "list", "list": [ { - "id": 25, + "id": 28, "kind": "command", "command": { "command": "line", @@ -207,7 +234,7 @@ } }, { - "id": 26, + "id": 29, "kind": "command", "command": { "command": "breakParent" @@ -216,31 +243,31 @@ ] }, { - "id": 28, + "id": 31, "kind": "text", "text": "private" }, { - "id": 35, + "id": 38, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 34, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 33, + "id": 36, "kind": "list", "list": [ { - "id": 31, + "id": 34, "kind": "list", "list": [ { - "id": 29, + "id": 32, "kind": "command", "command": { "command": "line", @@ -250,7 +277,7 @@ } }, { - "id": 30, + "id": 33, "kind": "command", "command": { "command": "breakParent" @@ -259,7 +286,7 @@ ] }, { - "id": 32, + "id": 35, "kind": "text", "text": "type Qux;" } @@ -272,11 +299,11 @@ } }, { - "id": 38, + "id": 41, "kind": "list", "list": [ { - "id": 36, + "id": 39, "kind": "command", "command": { "command": "line", @@ -286,7 +313,7 @@ } }, { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "breakParent" @@ -295,7 +322,7 @@ ] }, { - "id": 39, + "id": 42, "kind": "text", "text": "end Foo;" } diff --git a/testsuite/tests/unparsing/package_decl/no_end_name/doc-baseline.json b/testsuite/tests/unparsing/package_decl/no_end_name/doc-baseline.json index d3cea6c20..707f41f59 100644 --- a/testsuite/tests/unparsing/package_decl/no_end_name/doc-baseline.json +++ b/testsuite/tests/unparsing/package_decl/no_end_name/doc-baseline.json @@ -1,15 +1,15 @@ { - "id": 40, + "id": 43, "kind": "list", "list": [ { - "id": 17, + "id": 20, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 16, + "id": 19, "kind": "list", "list": [ { @@ -18,7 +18,7 @@ "text": "package Foo" }, { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -27,7 +27,7 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "list", "list": [ { @@ -54,13 +54,13 @@ ] }, { - "id": 11, + "id": 14, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 10, + "id": 13, "kind": "list", "list": [ { @@ -69,7 +69,7 @@ "text": "with" }, { - "id": 9, + "id": 12, "kind": "command", "command": { "command": "align", @@ -78,13 +78,13 @@ "n": 2 }, "alignContents": { - "id": 8, + "id": 11, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 7, + "id": 10, "kind": "list", "list": [ { @@ -98,9 +98,36 @@ } }, { - "id": 6, - "kind": "text", - "text": "Bar" + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Bar" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -121,7 +148,7 @@ } }, { - "id": 14, + "id": 17, "kind": "command", "command": { "command": "line", @@ -131,7 +158,7 @@ } }, { - "id": 15, + "id": 18, "kind": "text", "text": "is" } @@ -142,26 +169,26 @@ } }, { - "id": 24, + "id": 27, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 23, + "id": 26, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 22, + "id": 25, "kind": "list", "list": [ { - "id": 20, + "id": 23, "kind": "list", "list": [ { - "id": 18, + "id": 21, "kind": "command", "command": { "command": "line", @@ -171,7 +198,7 @@ } }, { - "id": 19, + "id": 22, "kind": "command", "command": { "command": "breakParent" @@ -180,7 +207,7 @@ ] }, { - "id": 21, + "id": 24, "kind": "text", "text": "type Baz;" } @@ -193,11 +220,11 @@ } }, { - "id": 27, + "id": 30, "kind": "list", "list": [ { - "id": 25, + "id": 28, "kind": "command", "command": { "command": "line", @@ -207,7 +234,7 @@ } }, { - "id": 26, + "id": 29, "kind": "command", "command": { "command": "breakParent" @@ -216,31 +243,31 @@ ] }, { - "id": 28, + "id": 31, "kind": "text", "text": "private" }, { - "id": 35, + "id": 38, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 34, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 33, + "id": 36, "kind": "list", "list": [ { - "id": 31, + "id": 34, "kind": "list", "list": [ { - "id": 29, + "id": 32, "kind": "command", "command": { "command": "line", @@ -250,7 +277,7 @@ } }, { - "id": 30, + "id": 33, "kind": "command", "command": { "command": "breakParent" @@ -259,7 +286,7 @@ ] }, { - "id": 32, + "id": 35, "kind": "text", "text": "type Qux;" } @@ -272,11 +299,11 @@ } }, { - "id": 38, + "id": 41, "kind": "list", "list": [ { - "id": 36, + "id": 39, "kind": "command", "command": { "command": "line", @@ -286,7 +313,7 @@ } }, { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "breakParent" @@ -295,7 +322,7 @@ ] }, { - "id": 39, + "id": 42, "kind": "text", "text": "end;" } diff --git a/testsuite/tests/unparsing/package_decl/no_private_part/doc-baseline.json b/testsuite/tests/unparsing/package_decl/no_private_part/doc-baseline.json index fc1ec973d..015d30404 100644 --- a/testsuite/tests/unparsing/package_decl/no_private_part/doc-baseline.json +++ b/testsuite/tests/unparsing/package_decl/no_private_part/doc-baseline.json @@ -1,15 +1,15 @@ { - "id": 29, + "id": 32, "kind": "list", "list": [ { - "id": 17, + "id": 20, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 16, + "id": 19, "kind": "list", "list": [ { @@ -18,7 +18,7 @@ "text": "package Foo" }, { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -27,7 +27,7 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "list", "list": [ { @@ -54,13 +54,13 @@ ] }, { - "id": 11, + "id": 14, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 10, + "id": 13, "kind": "list", "list": [ { @@ -69,7 +69,7 @@ "text": "with" }, { - "id": 9, + "id": 12, "kind": "command", "command": { "command": "align", @@ -78,13 +78,13 @@ "n": 2 }, "alignContents": { - "id": 8, + "id": 11, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 7, + "id": 10, "kind": "list", "list": [ { @@ -98,9 +98,36 @@ } }, { - "id": 6, - "kind": "text", - "text": "Bar" + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Bar" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -121,7 +148,7 @@ } }, { - "id": 14, + "id": 17, "kind": "command", "command": { "command": "line", @@ -131,7 +158,7 @@ } }, { - "id": 15, + "id": 18, "kind": "text", "text": "is" } @@ -142,26 +169,26 @@ } }, { - "id": 24, + "id": 27, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 23, + "id": 26, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 22, + "id": 25, "kind": "list", "list": [ { - "id": 20, + "id": 23, "kind": "list", "list": [ { - "id": 18, + "id": 21, "kind": "command", "command": { "command": "line", @@ -171,7 +198,7 @@ } }, { - "id": 19, + "id": 22, "kind": "command", "command": { "command": "breakParent" @@ -180,7 +207,7 @@ ] }, { - "id": 21, + "id": 24, "kind": "text", "text": "type Baz;" } @@ -193,11 +220,11 @@ } }, { - "id": 27, + "id": 30, "kind": "list", "list": [ { - "id": 25, + "id": 28, "kind": "command", "command": { "command": "line", @@ -207,7 +234,7 @@ } }, { - "id": 26, + "id": 29, "kind": "command", "command": { "command": "breakParent" @@ -216,7 +243,7 @@ ] }, { - "id": 28, + "id": 31, "kind": "text", "text": "end Foo;" } diff --git a/testsuite/tests/unparsing/package_decl/short_names/doc-baseline.json b/testsuite/tests/unparsing/package_decl/short_names/doc-baseline.json index ccb4d36e2..a2162d575 100644 --- a/testsuite/tests/unparsing/package_decl/short_names/doc-baseline.json +++ b/testsuite/tests/unparsing/package_decl/short_names/doc-baseline.json @@ -1,15 +1,15 @@ { - "id": 40, + "id": 43, "kind": "list", "list": [ { - "id": 17, + "id": 20, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 16, + "id": 19, "kind": "list", "list": [ { @@ -18,7 +18,7 @@ "text": "package Foo" }, { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -27,7 +27,7 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "list", "list": [ { @@ -54,13 +54,13 @@ ] }, { - "id": 11, + "id": 14, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 10, + "id": 13, "kind": "list", "list": [ { @@ -69,7 +69,7 @@ "text": "with" }, { - "id": 9, + "id": 12, "kind": "command", "command": { "command": "align", @@ -78,13 +78,13 @@ "n": 2 }, "alignContents": { - "id": 8, + "id": 11, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 7, + "id": 10, "kind": "list", "list": [ { @@ -98,9 +98,36 @@ } }, { - "id": 6, - "kind": "text", - "text": "Bar" + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 7, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "text", + "text": "Bar" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -121,7 +148,7 @@ } }, { - "id": 14, + "id": 17, "kind": "command", "command": { "command": "line", @@ -131,7 +158,7 @@ } }, { - "id": 15, + "id": 18, "kind": "text", "text": "is" } @@ -142,26 +169,26 @@ } }, { - "id": 24, + "id": 27, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 23, + "id": 26, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 22, + "id": 25, "kind": "list", "list": [ { - "id": 20, + "id": 23, "kind": "list", "list": [ { - "id": 18, + "id": 21, "kind": "command", "command": { "command": "line", @@ -171,7 +198,7 @@ } }, { - "id": 19, + "id": 22, "kind": "command", "command": { "command": "breakParent" @@ -180,7 +207,7 @@ ] }, { - "id": 21, + "id": 24, "kind": "text", "text": "type Baz;" } @@ -193,11 +220,11 @@ } }, { - "id": 27, + "id": 30, "kind": "list", "list": [ { - "id": 25, + "id": 28, "kind": "command", "command": { "command": "line", @@ -207,7 +234,7 @@ } }, { - "id": 26, + "id": 29, "kind": "command", "command": { "command": "breakParent" @@ -216,31 +243,31 @@ ] }, { - "id": 28, + "id": 31, "kind": "text", "text": "private" }, { - "id": 35, + "id": 38, "kind": "command", "command": { "command": "indent", "indentContents": { - "id": 34, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 33, + "id": 36, "kind": "list", "list": [ { - "id": 31, + "id": 34, "kind": "list", "list": [ { - "id": 29, + "id": 32, "kind": "command", "command": { "command": "line", @@ -250,7 +277,7 @@ } }, { - "id": 30, + "id": 33, "kind": "command", "command": { "command": "breakParent" @@ -259,7 +286,7 @@ ] }, { - "id": 32, + "id": 35, "kind": "text", "text": "type Qux;" } @@ -272,11 +299,11 @@ } }, { - "id": 38, + "id": 41, "kind": "list", "list": [ { - "id": 36, + "id": 39, "kind": "command", "command": { "command": "line", @@ -286,7 +313,7 @@ } }, { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "breakParent" @@ -295,7 +322,7 @@ ] }, { - "id": 39, + "id": 42, "kind": "text", "text": "end Foo;" } diff --git a/testsuite/tests/unparsing/protected_type_decl/with_aspects/doc-baseline.json b/testsuite/tests/unparsing/protected_type_decl/with_aspects/doc-baseline.json index 859eba201..c08cfcbc7 100644 --- a/testsuite/tests/unparsing/protected_type_decl/with_aspects/doc-baseline.json +++ b/testsuite/tests/unparsing/protected_type_decl/with_aspects/doc-baseline.json @@ -1,908 +1,950 @@ -{ - "id": 114, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 113, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 71, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "protected type Worker" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 54, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 53, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 51, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 50, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 49, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "list", - "list": [ - { - "id": 17, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 16, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "Priority_Level" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 15, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 14, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 13, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 12, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 11, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "System" - }, - { - "id": 8, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": true, - "hard": false - } - }, - { - "id": 9, - "kind": "text", - "text": ".Priority" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 20, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 19, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 18, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 23, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": ";" - }, - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "list", - "list": [ - { - "id": 39, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 38, - "kind": "list", - "list": [ - { - "id": 30, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 29, - "kind": "text", - "text": "Buffer_Parameter" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 31, - "kind": "text", - "text": " :" - }, - { - "id": 37, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 36, - "kind": "list", - "list": [ - { - "id": 32, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 35, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 33, - "kind": "text", - "text": "access Buffer" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 42, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 41, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 40, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 45, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 44, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 43, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 52, - "kind": "text", - "text": ")" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 67, - "kind": "list", - "list": [ - { - "id": 58, - "kind": "list", - "list": [ - { - "id": 56, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 57, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 59, - "kind": "text", - "text": "with" - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 63, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 62, - "kind": "list", - "list": [ - { - "id": 60, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 61, - "kind": "text", - "text": "Priority=>Prio" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 69, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 70, - "kind": "text", - "text": "is" - } - ] - }, - "break": true, - "expandedStates": null - } - }, - { - "id": 74, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 73, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 111, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 110, - "kind": "list", - "list": [ - { - "id": 105, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 104, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 103, - "kind": "list", - "list": [ - { - "id": 77, - "kind": "list", - "list": [ - { - "id": 75, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 76, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 87, - "kind": "list", - "list": [ - { - "id": 85, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 84, - "kind": "list", - "list": [ - { - "id": 83, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 82, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 81, - "kind": "list", - "list": [ - { - "id": 78, - "kind": "text", - "text": "entry Fill" - }, - { - "id": 80, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 79, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 91, - "kind": "list", - "list": [ - { - "id": 89, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 102, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 101, - "kind": "list", - "list": [ - { - "id": 99, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 98, - "kind": "list", - "list": [ - { - "id": 97, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 96, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 95, - "kind": "list", - "list": [ - { - "id": 92, - "kind": "text", - "text": "entry Drain" - }, - { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 100, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - } - }, - { - "id": 108, - "kind": "list", - "list": [ - { - "id": 106, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 107, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 109, - "kind": "text", - "text": "end Worker" - } - ] - }, - "break": true, - "expandedStates": null - } - }, - { - "id": 112, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 119, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 118, + "kind": "list", + "list": [ + { + "id": 77, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "protected type Worker" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 54, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 53, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 51, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 50, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 49, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "list", + "list": [ + { + "id": 17, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 16, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "Priority_Level" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 15, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 14, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 13, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 12, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 11, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "System" + }, + { + "id": 8, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": true, + "hard": false + } + }, + { + "id": 9, + "kind": "text", + "text": ".Priority" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 20, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 19, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 18, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 23, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": ";" + }, + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "list", + "list": [ + { + "id": 39, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 38, + "kind": "list", + "list": [ + { + "id": 30, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 29, + "kind": "text", + "text": "Buffer_Parameter" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 31, + "kind": "text", + "text": " :" + }, + { + "id": 37, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 36, + "kind": "list", + "list": [ + { + "id": 32, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 33, + "kind": "text", + "text": "access Buffer" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 42, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 41, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 40, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 45, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 52, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 73, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 72, + "kind": "list", + "list": [ + { + "id": 58, + "kind": "list", + "list": [ + { + "id": 56, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 57, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 71, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 70, + "kind": "list", + "list": [ + { + "id": 59, + "kind": "text", + "text": "with" + }, + { + "id": 69, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 68, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 67, + "kind": "list", + "list": [ + { + "id": 60, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 64, + "kind": "list", + "list": [ + { + "id": 61, + "kind": "text", + "text": "Priority =>" + }, + { + "id": 62, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 63, + "kind": "text", + "text": "Prio" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 74, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 75, + "kind": "text", + "text": "is" + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 116, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 115, + "kind": "list", + "list": [ + { + "id": 110, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 109, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 108, + "kind": "list", + "list": [ + { + "id": 82, + "kind": "list", + "list": [ + { + "id": 80, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 81, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 93, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 90, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 88, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 87, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 86, + "kind": "list", + "list": [ + { + "id": 83, + "kind": "text", + "text": "entry Fill" + }, + { + "id": 85, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 84, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 91, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 96, + "kind": "list", + "list": [ + { + "id": 94, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 95, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 107, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 106, + "kind": "list", + "list": [ + { + "id": 104, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 103, + "kind": "list", + "list": [ + { + "id": 102, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 97, + "kind": "text", + "text": "entry Drain" + }, + { + "id": 99, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 98, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 105, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 113, + "kind": "list", + "list": [ + { + "id": 111, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 112, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 114, + "kind": "text", + "text": "end Worker" + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 117, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/protected_type_decl/with_aspects/test.out b/testsuite/tests/unparsing/protected_type_decl/with_aspects/test.out index c918fb364..cdfdf70ab 100644 --- a/testsuite/tests/unparsing/protected_type_decl/with_aspects/test.out +++ b/testsuite/tests/unparsing/protected_type_decl/with_aspects/test.out @@ -1,6 +1,6 @@ protected type Worker (Priority_Level : System.Priority; Buffer_Parameter : access Buffer) - with Priority=>Prio + with Priority => Prio is entry Fill; entry Drain; diff --git a/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/doc-baseline.json b/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/doc-baseline.json index 5cc834547..394b5de57 100644 --- a/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/doc-baseline.json +++ b/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/doc-baseline.json @@ -1,1016 +1,1016 @@ -{ - "id": 131, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 130, - "kind": "list", - "list": [ - { - "id": 63, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 62, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "protected type Buffer" - }, - { - "id": 59, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 58, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 57, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 54, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 53, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "list", - "list": [ - { - "id": 11, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "Nb_Elements_In_Buffer" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 7, - "kind": "text", - "text": "Integer" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 17, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 16, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 15, - "kind": "list", - "list": [ - { - "id": 12, - "kind": "text", - "text": " :=" - }, - { - "id": 13, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 14, - "kind": "text", - "text": "100" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 23, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 18, - "kind": "text", - "text": " :=" - }, - { - "id": 19, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 20, - "kind": "text", - "text": "100" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": ";" - }, - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 52, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 51, - "kind": "list", - "list": [ - { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - { - "id": 30, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 29, - "kind": "text", - "text": "Need_To_Activate_All" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 31, - "kind": "text", - "text": " :" - }, - { - "id": 35, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 32, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 33, - "kind": "text", - "text": "Boolean" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 50, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 43, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 42, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 41, - "kind": "list", - "list": [ - { - "id": 38, - "kind": "text", - "text": " :=" - }, - { - "id": 39, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 40, - "kind": "text", - "text": "False" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 49, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "list", - "list": [ - { - "id": 44, - "kind": "text", - "text": " :=" - }, - { - "id": 45, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 46, - "kind": "text", - "text": "False" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 56, - "kind": "text", - "text": ")" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 60, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 61, - "kind": "text", - "text": "is" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 65, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 64, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 128, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 127, - "kind": "list", - "list": [ - { - "id": 96, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 95, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 94, - "kind": "list", - "list": [ - { - "id": 68, - "kind": "list", - "list": [ - { - "id": 66, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 67, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 76, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 75, - "kind": "list", - "list": [ - { - "id": 74, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 73, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 72, - "kind": "list", - "list": [ - { - "id": 69, - "kind": "text", - "text": "procedure Activate" - }, - { - "id": 71, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 70, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 77, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 82, - "kind": "list", - "list": [ - { - "id": 80, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 81, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 93, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 90, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 88, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 87, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 86, - "kind": "list", - "list": [ - { - "id": 83, - "kind": "text", - "text": "procedure Release" - }, - { - "id": 85, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 84, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 91, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - } - }, - { - "id": 99, - "kind": "list", - "list": [ - { - "id": 97, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 98, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 100, - "kind": "text", - "text": "private" - }, - { - "id": 122, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 121, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 120, - "kind": "list", - "list": [ - { - "id": 103, - "kind": "list", - "list": [ - { - "id": 101, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 102, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 119, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 118, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 117, - "kind": "list", - "list": [ - { - "id": 105, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 104, - "kind": "text", - "text": "Busy" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 106, - "kind": "text", - "text": " :" - }, - { - "id": 107, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 116, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 115, - "kind": "list", - "list": [ - { - "id": 111, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 110, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 109, - "kind": "list", - "list": [ - { - "id": 108, - "kind": "text", - "text": "Boolean" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 112, - "kind": "text", - "text": " :=" - }, - { - "id": 113, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 114, - "kind": "text", - "text": "False;" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - } - }, - { - "id": 125, - "kind": "list", - "list": [ - { - "id": 123, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 124, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 126, - "kind": "text", - "text": "end Buffer" - } - ] - }, - "break": true, - "expandedStates": null - } - }, - { - "id": 129, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 131, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 130, + "kind": "list", + "list": [ + { + "id": 63, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 62, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "protected type Buffer" + }, + { + "id": 59, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 58, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 57, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 54, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 53, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "list", + "list": [ + { + "id": 11, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "Nb_Elements_In_Buffer" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 7, + "kind": "text", + "text": "Integer" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 17, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 16, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 15, + "kind": "list", + "list": [ + { + "id": 12, + "kind": "text", + "text": " :=" + }, + { + "id": 13, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 14, + "kind": "text", + "text": "100" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 23, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 18, + "kind": "text", + "text": " :=" + }, + { + "id": 19, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 20, + "kind": "text", + "text": "100" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": ";" + }, + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 52, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 51, + "kind": "list", + "list": [ + { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + { + "id": 30, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 29, + "kind": "text", + "text": "Need_To_Activate_All" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 31, + "kind": "text", + "text": " :" + }, + { + "id": 35, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 32, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 33, + "kind": "text", + "text": "Boolean" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 50, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 43, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 42, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 41, + "kind": "list", + "list": [ + { + "id": 38, + "kind": "text", + "text": " :=" + }, + { + "id": 39, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 40, + "kind": "text", + "text": "False" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 49, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "list", + "list": [ + { + "id": 44, + "kind": "text", + "text": " :=" + }, + { + "id": 45, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 46, + "kind": "text", + "text": "False" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 56, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 60, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 61, + "kind": "text", + "text": "is" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 65, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 64, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 128, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 127, + "kind": "list", + "list": [ + { + "id": 96, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 95, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 94, + "kind": "list", + "list": [ + { + "id": 68, + "kind": "list", + "list": [ + { + "id": 66, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 67, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 76, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 75, + "kind": "list", + "list": [ + { + "id": 74, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 73, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 72, + "kind": "list", + "list": [ + { + "id": 69, + "kind": "text", + "text": "procedure Activate" + }, + { + "id": 71, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 70, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 77, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 82, + "kind": "list", + "list": [ + { + "id": 80, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 81, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 93, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 90, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 88, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 87, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 86, + "kind": "list", + "list": [ + { + "id": 83, + "kind": "text", + "text": "procedure Release" + }, + { + "id": 85, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 84, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 91, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 99, + "kind": "list", + "list": [ + { + "id": 97, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 98, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 100, + "kind": "text", + "text": "private" + }, + { + "id": 122, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 121, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 120, + "kind": "list", + "list": [ + { + "id": 103, + "kind": "list", + "list": [ + { + "id": 101, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 102, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 119, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 118, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 117, + "kind": "list", + "list": [ + { + "id": 105, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 104, + "kind": "text", + "text": "Busy" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 106, + "kind": "text", + "text": " :" + }, + { + "id": 107, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 116, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 115, + "kind": "list", + "list": [ + { + "id": 111, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 110, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 109, + "kind": "list", + "list": [ + { + "id": 108, + "kind": "text", + "text": "Boolean" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 112, + "kind": "text", + "text": " :=" + }, + { + "id": 113, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 114, + "kind": "text", + "text": "False;" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 125, + "kind": "list", + "list": [ + { + "id": 123, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 124, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 126, + "kind": "text", + "text": "end Buffer" + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 129, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/doc-baseline.json b/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/doc-baseline.json index 7c244159e..f0494678f 100644 --- a/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/doc-baseline.json +++ b/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/doc-baseline.json @@ -1,555 +1,555 @@ -{ - "id": 72, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 71, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "protected type Resource" - }, - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 2, - "kind": "text", - "text": "is" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 6, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 5, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 69, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 68, - "kind": "list", - "list": [ - { - "id": 37, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 36, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 35, - "kind": "list", - "list": [ - { - "id": 9, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 8, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 19, - "kind": "list", - "list": [ - { - "id": 17, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 16, - "kind": "list", - "list": [ - { - "id": 15, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 14, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 13, - "kind": "list", - "list": [ - { - "id": 10, - "kind": "text", - "text": "entry Seize" - }, - { - "id": 12, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 11, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 18, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 23, - "kind": "list", - "list": [ - { - "id": 21, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 22, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 28, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 27, - "kind": "list", - "list": [ - { - "id": 24, - "kind": "text", - "text": "procedure Release" - }, - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 32, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - } - }, - { - "id": 40, - "kind": "list", - "list": [ - { - "id": 38, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 39, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 41, - "kind": "text", - "text": "private" - }, - { - "id": 63, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - { - "id": 44, - "kind": "list", - "list": [ - { - "id": 42, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 43, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 60, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - { - "id": 46, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 45, - "kind": "text", - "text": "Busy" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 47, - "kind": "text", - "text": " :" - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 57, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 52, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 51, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 50, - "kind": "list", - "list": [ - { - "id": 49, - "kind": "text", - "text": "Boolean" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 53, - "kind": "text", - "text": " :=" - }, - { - "id": 54, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 55, - "kind": "text", - "text": "False;" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - } - }, - { - "id": 66, - "kind": "list", - "list": [ - { - "id": 64, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 65, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 67, - "kind": "text", - "text": "end Resource" - } - ] - }, - "break": true, - "expandedStates": null - } - }, - { - "id": 70, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 72, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 71, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "protected type Resource" + }, + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 2, + "kind": "text", + "text": "is" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 6, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 5, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 69, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 68, + "kind": "list", + "list": [ + { + "id": 37, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 36, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 35, + "kind": "list", + "list": [ + { + "id": 9, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 8, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 19, + "kind": "list", + "list": [ + { + "id": 17, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 16, + "kind": "list", + "list": [ + { + "id": 15, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 14, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 13, + "kind": "list", + "list": [ + { + "id": 10, + "kind": "text", + "text": "entry Seize" + }, + { + "id": 12, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 11, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 18, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 23, + "kind": "list", + "list": [ + { + "id": 21, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 22, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 34, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 33, + "kind": "list", + "list": [ + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 28, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 27, + "kind": "list", + "list": [ + { + "id": 24, + "kind": "text", + "text": "procedure Release" + }, + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 32, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 40, + "kind": "list", + "list": [ + { + "id": 38, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 39, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 41, + "kind": "text", + "text": "private" + }, + { + "id": 63, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + { + "id": 44, + "kind": "list", + "list": [ + { + "id": 42, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 43, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 60, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + { + "id": 46, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 45, + "kind": "text", + "text": "Busy" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 47, + "kind": "text", + "text": " :" + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 57, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 52, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 51, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 50, + "kind": "list", + "list": [ + { + "id": 49, + "kind": "text", + "text": "Boolean" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 53, + "kind": "text", + "text": " :=" + }, + { + "id": 54, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 55, + "kind": "text", + "text": "False;" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 66, + "kind": "list", + "list": [ + { + "id": 64, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 65, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 67, + "kind": "text", + "text": "end Resource" + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 70, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/subp_body/no_end_name/doc-baseline.json b/testsuite/tests/unparsing/subp_body/no_end_name/doc-baseline.json index 245bc828f..3e0d041a5 100644 --- a/testsuite/tests/unparsing/subp_body/no_end_name/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_body/no_end_name/doc-baseline.json @@ -1,1015 +1,1015 @@ -{ - "id": 127, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 126, - "kind": "list", - "list": [ - { - "id": 104, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "A" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 23, - "kind": "text", - "text": ";" - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 43, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": " :" - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 41, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 45, - "kind": "text", - "text": ";" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "text", - "text": "C" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "text", - "text": " :" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 63, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 67, - "kind": "text", - "text": ";" - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 87, - "kind": "list", - "list": [ - { - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "text", - "text": "D" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 71, - "kind": "text", - "text": " :" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 73, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 82, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 85, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 84, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 83, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 91, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 99, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 98, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 97, - "kind": "list", - "list": [ - { - "id": 95, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "text", - "text": "return Fred" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 105, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 106, - "kind": "text", - "text": "is" - }, - { - "id": 113, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 112, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 111, - "kind": "list", - "list": [ - { - "id": 109, - "kind": "list", - "list": [ - { - "id": 107, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 108, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 110, - "kind": "text", - "text": "type Garply;" - } - ] - }, - "break": true, - "expandedStates": null - } - } - } - }, - { - "id": 114, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 115, - "kind": "text", - "text": "begin" - }, - { - "id": 123, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 122, - "kind": "list", - "list": [ - { - "id": 121, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 120, - "kind": "list", - "list": [ - { - "id": 118, - "kind": "list", - "list": [ - { - "id": 116, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 117, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 119, - "kind": "text", - "text": "null;" - } - ] - } - } - } - ] - }, - "break": true, - "expandedStates": null - } - }, - { - "id": 124, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 125, - "kind": "text", - "text": "end;" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 127, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 126, + "kind": "list", + "list": [ + { + "id": 104, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 103, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foo" + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "A" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 23, + "kind": "text", + "text": ";" + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": " :" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 41, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 45, + "kind": "text", + "text": ";" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "text", + "text": "C" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "text", + "text": " :" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 63, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 67, + "kind": "text", + "text": ";" + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "text", + "text": "D" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 71, + "kind": "text", + "text": " :" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 73, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 86, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 82, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 85, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 91, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 99, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 98, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 97, + "kind": "list", + "list": [ + { + "id": 95, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 96, + "kind": "text", + "text": "return Fred" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 105, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 106, + "kind": "text", + "text": "is" + }, + { + "id": 113, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 112, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 111, + "kind": "list", + "list": [ + { + "id": 109, + "kind": "list", + "list": [ + { + "id": 107, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 108, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 110, + "kind": "text", + "text": "type Garply;" + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 114, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 115, + "kind": "text", + "text": "begin" + }, + { + "id": 123, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 122, + "kind": "list", + "list": [ + { + "id": 121, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 120, + "kind": "list", + "list": [ + { + "id": 118, + "kind": "list", + "list": [ + { + "id": 116, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 117, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 119, + "kind": "text", + "text": "null;" + } + ] + } + } + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 124, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 125, + "kind": "text", + "text": "end;" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/subp_body/with_decls/doc-baseline.json b/testsuite/tests/unparsing/subp_body/with_decls/doc-baseline.json index 0c0f506ca..b9998a127 100644 --- a/testsuite/tests/unparsing/subp_body/with_decls/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_body/with_decls/doc-baseline.json @@ -1,1015 +1,1015 @@ -{ - "id": 127, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 126, - "kind": "list", - "list": [ - { - "id": 104, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "A" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 23, - "kind": "text", - "text": ";" - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 43, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": " :" - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 41, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 45, - "kind": "text", - "text": ";" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "text", - "text": "C" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "text", - "text": " :" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 63, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 67, - "kind": "text", - "text": ";" - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 87, - "kind": "list", - "list": [ - { - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "text", - "text": "D" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 71, - "kind": "text", - "text": " :" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 73, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 82, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 85, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 84, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 83, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 91, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 99, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 98, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 97, - "kind": "list", - "list": [ - { - "id": 95, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "text", - "text": "return Fred" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 105, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 106, - "kind": "text", - "text": "is" - }, - { - "id": 113, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 112, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 111, - "kind": "list", - "list": [ - { - "id": 109, - "kind": "list", - "list": [ - { - "id": 107, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 108, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 110, - "kind": "text", - "text": "type Garply;" - } - ] - }, - "break": true, - "expandedStates": null - } - } - } - }, - { - "id": 114, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 115, - "kind": "text", - "text": "begin" - }, - { - "id": 123, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 122, - "kind": "list", - "list": [ - { - "id": 121, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 120, - "kind": "list", - "list": [ - { - "id": 118, - "kind": "list", - "list": [ - { - "id": 116, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 117, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 119, - "kind": "text", - "text": "null;" - } - ] - } - } - } - ] - }, - "break": true, - "expandedStates": null - } - }, - { - "id": 124, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 125, - "kind": "text", - "text": "end Foo;" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 127, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 126, + "kind": "list", + "list": [ + { + "id": 104, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 103, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foo" + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "A" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 23, + "kind": "text", + "text": ";" + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": " :" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 41, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 45, + "kind": "text", + "text": ";" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "text", + "text": "C" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "text", + "text": " :" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 63, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 67, + "kind": "text", + "text": ";" + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "text", + "text": "D" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 71, + "kind": "text", + "text": " :" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 73, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 86, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 82, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 85, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 91, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 99, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 98, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 97, + "kind": "list", + "list": [ + { + "id": 95, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 96, + "kind": "text", + "text": "return Fred" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 105, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 106, + "kind": "text", + "text": "is" + }, + { + "id": 113, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 112, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 111, + "kind": "list", + "list": [ + { + "id": 109, + "kind": "list", + "list": [ + { + "id": 107, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 108, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 110, + "kind": "text", + "text": "type Garply;" + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 114, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 115, + "kind": "text", + "text": "begin" + }, + { + "id": 123, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 122, + "kind": "list", + "list": [ + { + "id": 121, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 120, + "kind": "list", + "list": [ + { + "id": 118, + "kind": "list", + "list": [ + { + "id": 116, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 117, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 119, + "kind": "text", + "text": "null;" + } + ] + } + } + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 124, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 125, + "kind": "text", + "text": "end Foo;" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/subp_body/without_decls/doc-baseline.json b/testsuite/tests/unparsing/subp_body/without_decls/doc-baseline.json index 3586631e4..f757fbc48 100644 --- a/testsuite/tests/unparsing/subp_body/without_decls/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_body/without_decls/doc-baseline.json @@ -1,977 +1,977 @@ -{ - "id": 122, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 121, - "kind": "list", - "list": [ - { - "id": 104, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "A" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 23, - "kind": "text", - "text": ";" - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 43, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": " :" - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 41, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 45, - "kind": "text", - "text": ";" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "text", - "text": "C" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "text", - "text": " :" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 63, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 67, - "kind": "text", - "text": ";" - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 87, - "kind": "list", - "list": [ - { - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "text", - "text": "D" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 71, - "kind": "text", - "text": " :" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 73, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 82, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 85, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 84, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 83, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 91, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 99, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 98, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 97, - "kind": "list", - "list": [ - { - "id": 95, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "text", - "text": "return Fred" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 105, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 106, - "kind": "text", - "text": "is" - }, - { - "id": 108, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 107, - "kind": "list", - "list": [ - ] - } - } - }, - { - "id": 109, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 110, - "kind": "text", - "text": "begin" - }, - { - "id": 118, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 117, - "kind": "list", - "list": [ - { - "id": 116, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 115, - "kind": "list", - "list": [ - { - "id": 113, - "kind": "list", - "list": [ - { - "id": 111, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 112, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 114, - "kind": "text", - "text": "null;" - } - ] - } - } - } - ] - }, - "break": true, - "expandedStates": null - } - }, - { - "id": 119, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 120, - "kind": "text", - "text": "end Foo;" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 122, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 121, + "kind": "list", + "list": [ + { + "id": 104, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 103, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foo" + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "A" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 23, + "kind": "text", + "text": ";" + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": " :" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 41, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 45, + "kind": "text", + "text": ";" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "text", + "text": "C" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "text", + "text": " :" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 63, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 67, + "kind": "text", + "text": ";" + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "text", + "text": "D" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 71, + "kind": "text", + "text": " :" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 73, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 86, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 82, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 85, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 91, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 99, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 98, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 97, + "kind": "list", + "list": [ + { + "id": 95, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 96, + "kind": "text", + "text": "return Fred" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 105, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 106, + "kind": "text", + "text": "is" + }, + { + "id": 108, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 107, + "kind": "list", + "list": [ + ] + } + } + }, + { + "id": 109, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 110, + "kind": "text", + "text": "begin" + }, + { + "id": 118, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 117, + "kind": "list", + "list": [ + { + "id": 116, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 115, + "kind": "list", + "list": [ + { + "id": 113, + "kind": "list", + "list": [ + { + "id": 111, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 112, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 114, + "kind": "text", + "text": "null;" + } + ] + } + } + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 119, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 120, + "kind": "text", + "text": "end Foo;" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/subp_body_stub/short_with_aspects/doc-baseline.json b/testsuite/tests/unparsing/subp_body_stub/short_with_aspects/doc-baseline.json index 1d609a5b5..8adedf884 100644 --- a/testsuite/tests/unparsing/subp_body_stub/short_with_aspects/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_body_stub/short_with_aspects/doc-baseline.json @@ -1,11 +1,11 @@ { - "id": 118, + "id": 121, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 117, + "id": 120, "kind": "list", "list": [ { @@ -880,13 +880,13 @@ } }, { - "id": 115, + "id": 118, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 114, + "id": 117, "kind": "list", "list": [ { @@ -895,7 +895,7 @@ "text": "with" }, { - "id": 113, + "id": 116, "kind": "command", "command": { "command": "align", @@ -904,13 +904,13 @@ "n": 2 }, "alignContents": { - "id": 112, + "id": 115, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 111, + "id": 114, "kind": "list", "list": [ { @@ -924,9 +924,36 @@ } }, { - "id": 110, - "kind": "text", - "text": "Garply" + "id": 113, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 112, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 111, + "kind": "list", + "list": [ + { + "id": 110, + "kind": "text", + "text": "Garply" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } } ] }, @@ -943,7 +970,7 @@ } }, { - "id": 116, + "id": 119, "kind": "text", "text": ";" } diff --git a/testsuite/tests/unparsing/subp_decl/long_not_overriding/doc-baseline.json b/testsuite/tests/unparsing/subp_decl/long_not_overriding/doc-baseline.json index 207ffbd5f..1ac9592c6 100644 --- a/testsuite/tests/unparsing/subp_decl/long_not_overriding/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_decl/long_not_overriding/doc-baseline.json @@ -1,898 +1,898 @@ -{ - "id": 111, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 110, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "not overriding" - }, - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 108, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 107, - "kind": "list", - "list": [ - { - "id": 106, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 105, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 104, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "function Foo" - }, - { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 3, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 95, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 94, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "text", - "text": "(" - }, - { - "id": 92, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 91, - "kind": "list", - "list": [ - { - "id": 24, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 23, - "kind": "list", - "list": [ - { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 5, - "kind": "text", - "text": "AAAAA" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 7, - "kind": "text", - "text": " :" - }, - { - "id": 13, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 8, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 9, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 22, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 18, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 17, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 16, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 21, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 20, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 19, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 25, - "kind": "text", - "text": ";" - }, - { - "id": 26, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 45, - "kind": "list", - "list": [ - { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 27, - "kind": "text", - "text": "BBBBB" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 29, - "kind": "text", - "text": " :" - }, - { - "id": 35, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 30, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 31, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 40, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 39, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 38, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 43, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 42, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 41, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 47, - "kind": "text", - "text": ";" - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 67, - "kind": "list", - "list": [ - { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 49, - "kind": "text", - "text": "CCCC" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 51, - "kind": "text", - "text": " :" - }, - { - "id": 57, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 52, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 53, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 62, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 61, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 60, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 65, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 64, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 63, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 69, - "kind": "text", - "text": ";" - }, - { - "id": 70, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 71, - "kind": "text", - "text": "DDDD" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 73, - "kind": "text", - "text": " :" - }, - { - "id": 79, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 74, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 75, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 84, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 83, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 82, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 87, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 86, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 85, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 93, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 100, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 99, - "kind": "list", - "list": [ - { - "id": 97, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 98, - "kind": "text", - "text": "return Fred" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 109, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } -} +{ + "id": 111, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 110, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "not overriding" + }, + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 108, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 107, + "kind": "list", + "list": [ + { + "id": 106, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 105, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 104, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "function Foo" + }, + { + "id": 103, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 3, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 96, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 95, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 94, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "text", + "text": "(" + }, + { + "id": 92, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 91, + "kind": "list", + "list": [ + { + "id": 24, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 23, + "kind": "list", + "list": [ + { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 5, + "kind": "text", + "text": "AAAAA" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 7, + "kind": "text", + "text": " :" + }, + { + "id": 13, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 8, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 9, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 22, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 18, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 17, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 16, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 21, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 20, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 19, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 25, + "kind": "text", + "text": ";" + }, + { + "id": 26, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 45, + "kind": "list", + "list": [ + { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 27, + "kind": "text", + "text": "BBBBB" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 29, + "kind": "text", + "text": " :" + }, + { + "id": 35, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 30, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 31, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 40, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 39, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 38, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 43, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 42, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 41, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 47, + "kind": "text", + "text": ";" + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 67, + "kind": "list", + "list": [ + { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 49, + "kind": "text", + "text": "CCCC" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 51, + "kind": "text", + "text": " :" + }, + { + "id": 57, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 52, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 53, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 62, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 61, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 60, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 65, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 64, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 63, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 69, + "kind": "text", + "text": ";" + }, + { + "id": 70, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 71, + "kind": "text", + "text": "DDDD" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 73, + "kind": "text", + "text": " :" + }, + { + "id": 79, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 74, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 75, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 84, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 83, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 82, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 87, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 86, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 85, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 93, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 100, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 99, + "kind": "list", + "list": [ + { + "id": 97, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 98, + "kind": "text", + "text": "return Fred" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 109, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/subp_decl/long_with_long_aspects/doc-baseline.json b/testsuite/tests/unparsing/subp_decl/long_with_long_aspects/doc-baseline.json index 2615779ca..33c7a300d 100644 --- a/testsuite/tests/unparsing/subp_decl/long_with_long_aspects/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_decl/long_with_long_aspects/doc-baseline.json @@ -1,969 +1,996 @@ -{ - "id": 120, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 119, - "kind": "list", - "list": [ - { - "id": 117, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 116, - "kind": "list", - "list": [ - { - "id": 104, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "A" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 23, - "kind": "text", - "text": ";" - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 43, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": " :" - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 41, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 45, - "kind": "text", - "text": ";" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "text", - "text": "C" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "text", - "text": " :" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 63, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 67, - "kind": "text", - "text": ";" - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 87, - "kind": "list", - "list": [ - { - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "text", - "text": "D" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 71, - "kind": "text", - "text": " :" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 73, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 82, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 85, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 84, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 83, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 91, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 99, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 98, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 97, - "kind": "list", - "list": [ - { - "id": 95, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "text", - "text": "return Freddddddddddddd" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 107, - "kind": "list", - "list": [ - { - "id": 105, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 106, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 115, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 114, - "kind": "list", - "list": [ - { - "id": 108, - "kind": "text", - "text": "with" - }, - { - "id": 113, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 112, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 111, - "kind": "list", - "list": [ - { - "id": 109, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 110, - "kind": "text", - "text": "Garplyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - }, - { - "id": 118, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 123, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 122, + "kind": "list", + "list": [ + { + "id": 120, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 119, + "kind": "list", + "list": [ + { + "id": 104, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 103, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foo" + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "A" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 23, + "kind": "text", + "text": ";" + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": " :" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 41, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 45, + "kind": "text", + "text": ";" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "text", + "text": "C" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "text", + "text": " :" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 63, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 67, + "kind": "text", + "text": ";" + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "text", + "text": "D" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 71, + "kind": "text", + "text": " :" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 73, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 86, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 82, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 85, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 91, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 99, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 98, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 97, + "kind": "list", + "list": [ + { + "id": 95, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 96, + "kind": "text", + "text": "return Freddddddddddddd" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 107, + "kind": "list", + "list": [ + { + "id": 105, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 106, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 118, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 117, + "kind": "list", + "list": [ + { + "id": 108, + "kind": "text", + "text": "with" + }, + { + "id": 116, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 115, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 114, + "kind": "list", + "list": [ + { + "id": 109, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 113, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 112, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 111, + "kind": "list", + "list": [ + { + "id": 110, + "kind": "text", + "text": "Garplyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 121, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/subp_decl/long_with_short_aspects/doc-baseline.json b/testsuite/tests/unparsing/subp_decl/long_with_short_aspects/doc-baseline.json index 5a20acbec..7c2e705a2 100644 --- a/testsuite/tests/unparsing/subp_decl/long_with_short_aspects/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_decl/long_with_short_aspects/doc-baseline.json @@ -1,969 +1,996 @@ -{ - "id": 120, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 119, - "kind": "list", - "list": [ - { - "id": 117, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 116, - "kind": "list", - "list": [ - { - "id": 104, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "A" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 23, - "kind": "text", - "text": ";" - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 43, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": " :" - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 41, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 45, - "kind": "text", - "text": ";" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "text", - "text": "C" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "text", - "text": " :" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 63, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 67, - "kind": "text", - "text": ";" - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 87, - "kind": "list", - "list": [ - { - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "text", - "text": "D" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 71, - "kind": "text", - "text": " :" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 73, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 82, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 85, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 84, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 83, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 91, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 99, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 98, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 97, - "kind": "list", - "list": [ - { - "id": 95, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "text", - "text": "return Freddddd" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 107, - "kind": "list", - "list": [ - { - "id": 105, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 106, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 115, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 114, - "kind": "list", - "list": [ - { - "id": 108, - "kind": "text", - "text": "with" - }, - { - "id": 113, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 112, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 111, - "kind": "list", - "list": [ - { - "id": 109, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 110, - "kind": "text", - "text": "Garply" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - }, - { - "id": 118, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 123, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 122, + "kind": "list", + "list": [ + { + "id": 120, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 119, + "kind": "list", + "list": [ + { + "id": 104, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 103, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foo" + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "A" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 23, + "kind": "text", + "text": ";" + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": " :" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 41, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 45, + "kind": "text", + "text": ";" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "text", + "text": "C" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "text", + "text": " :" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 63, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 67, + "kind": "text", + "text": ";" + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "text", + "text": "D" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 71, + "kind": "text", + "text": " :" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 73, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 86, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 82, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 85, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 91, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 99, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 98, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 97, + "kind": "list", + "list": [ + { + "id": 95, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 96, + "kind": "text", + "text": "return Freddddd" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 107, + "kind": "list", + "list": [ + { + "id": 105, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 106, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 118, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 117, + "kind": "list", + "list": [ + { + "id": 108, + "kind": "text", + "text": "with" + }, + { + "id": 116, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 115, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 114, + "kind": "list", + "list": [ + { + "id": 109, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 113, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 112, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 111, + "kind": "list", + "list": [ + { + "id": 110, + "kind": "text", + "text": "Garply" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 121, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/subp_decl/short_overriding/doc-baseline.json b/testsuite/tests/unparsing/subp_decl/short_overriding/doc-baseline.json index 8d983b8bc..ac4c074f6 100644 --- a/testsuite/tests/unparsing/subp_decl/short_overriding/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_decl/short_overriding/doc-baseline.json @@ -1,898 +1,898 @@ -{ - "id": 111, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 110, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "overriding" - }, - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 108, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 107, - "kind": "list", - "list": [ - { - "id": 106, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 105, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 104, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "function Foo" - }, - { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 3, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 95, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 94, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "text", - "text": "(" - }, - { - "id": 92, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 91, - "kind": "list", - "list": [ - { - "id": 24, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 23, - "kind": "list", - "list": [ - { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 5, - "kind": "text", - "text": "A" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 7, - "kind": "text", - "text": " :" - }, - { - "id": 13, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 8, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 9, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 22, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 18, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 17, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 16, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 21, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 20, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 19, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 25, - "kind": "text", - "text": ";" - }, - { - "id": 26, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 45, - "kind": "list", - "list": [ - { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 27, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 29, - "kind": "text", - "text": " :" - }, - { - "id": 35, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 30, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 31, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 40, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 39, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 38, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 43, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 42, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 41, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 47, - "kind": "text", - "text": ";" - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 67, - "kind": "list", - "list": [ - { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 49, - "kind": "text", - "text": "C" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 51, - "kind": "text", - "text": " :" - }, - { - "id": 57, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 52, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 53, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 62, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 61, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 60, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 65, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 64, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 63, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 69, - "kind": "text", - "text": ";" - }, - { - "id": 70, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 71, - "kind": "text", - "text": "D" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 73, - "kind": "text", - "text": " :" - }, - { - "id": 79, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 74, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 75, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 84, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 83, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 82, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 87, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 86, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 85, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 93, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 100, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 99, - "kind": "list", - "list": [ - { - "id": 97, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 98, - "kind": "text", - "text": "return Fred" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 109, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } -} +{ + "id": 111, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 110, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "overriding" + }, + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 108, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 107, + "kind": "list", + "list": [ + { + "id": 106, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 105, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 104, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "function Foo" + }, + { + "id": 103, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 3, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 96, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 95, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 94, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "text", + "text": "(" + }, + { + "id": 92, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 91, + "kind": "list", + "list": [ + { + "id": 24, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 23, + "kind": "list", + "list": [ + { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 5, + "kind": "text", + "text": "A" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 7, + "kind": "text", + "text": " :" + }, + { + "id": 13, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 8, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 9, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 22, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 18, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 17, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 16, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 21, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 20, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 19, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 25, + "kind": "text", + "text": ";" + }, + { + "id": 26, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 45, + "kind": "list", + "list": [ + { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 27, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 29, + "kind": "text", + "text": " :" + }, + { + "id": 35, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 30, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 31, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 40, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 39, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 38, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 43, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 42, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 41, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 47, + "kind": "text", + "text": ";" + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 67, + "kind": "list", + "list": [ + { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 49, + "kind": "text", + "text": "C" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 51, + "kind": "text", + "text": " :" + }, + { + "id": 57, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 52, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 53, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 62, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 61, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 60, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 65, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 64, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 63, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 69, + "kind": "text", + "text": ";" + }, + { + "id": 70, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 71, + "kind": "text", + "text": "D" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 73, + "kind": "text", + "text": " :" + }, + { + "id": 79, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 74, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 75, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 84, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 83, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 82, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 87, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 86, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 85, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 93, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 100, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 99, + "kind": "list", + "list": [ + { + "id": 97, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 98, + "kind": "text", + "text": "return Fred" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 109, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/subp_decl/short_with_long_aspects/doc-baseline.json b/testsuite/tests/unparsing/subp_decl/short_with_long_aspects/doc-baseline.json index 84abf57db..7eb855c34 100644 --- a/testsuite/tests/unparsing/subp_decl/short_with_long_aspects/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_decl/short_with_long_aspects/doc-baseline.json @@ -1,969 +1,996 @@ -{ - "id": 120, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 119, - "kind": "list", - "list": [ - { - "id": 117, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 116, - "kind": "list", - "list": [ - { - "id": 104, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "A" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 23, - "kind": "text", - "text": ";" - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 43, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": " :" - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 41, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 45, - "kind": "text", - "text": ";" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "text", - "text": "C" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "text", - "text": " :" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 63, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 67, - "kind": "text", - "text": ";" - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 87, - "kind": "list", - "list": [ - { - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "text", - "text": "D" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 71, - "kind": "text", - "text": " :" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 73, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 82, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 85, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 84, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 83, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 91, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 99, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 98, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 97, - "kind": "list", - "list": [ - { - "id": 95, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "text", - "text": "return Fred" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 107, - "kind": "list", - "list": [ - { - "id": 105, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 106, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 115, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 114, - "kind": "list", - "list": [ - { - "id": 108, - "kind": "text", - "text": "with" - }, - { - "id": 113, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 112, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 111, - "kind": "list", - "list": [ - { - "id": 109, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 110, - "kind": "text", - "text": "Garplyyyyy" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - }, - { - "id": 118, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 123, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 122, + "kind": "list", + "list": [ + { + "id": 120, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 119, + "kind": "list", + "list": [ + { + "id": 104, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 103, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foo" + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "A" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 23, + "kind": "text", + "text": ";" + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": " :" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 41, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 45, + "kind": "text", + "text": ";" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "text", + "text": "C" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "text", + "text": " :" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 63, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 67, + "kind": "text", + "text": ";" + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "text", + "text": "D" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 71, + "kind": "text", + "text": " :" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 73, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 86, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 82, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 85, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 91, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 99, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 98, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 97, + "kind": "list", + "list": [ + { + "id": 95, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 96, + "kind": "text", + "text": "return Fred" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 107, + "kind": "list", + "list": [ + { + "id": 105, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 106, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 118, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 117, + "kind": "list", + "list": [ + { + "id": 108, + "kind": "text", + "text": "with" + }, + { + "id": 116, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 115, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 114, + "kind": "list", + "list": [ + { + "id": 109, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 113, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 112, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 111, + "kind": "list", + "list": [ + { + "id": 110, + "kind": "text", + "text": "Garplyyyyy" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 121, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/subp_spec/function/everything_long/doc-baseline.json b/testsuite/tests/unparsing/subp_spec/function/everything_long/doc-baseline.json index 74054c376..e5c29ec2e 100644 --- a/testsuite/tests/unparsing/subp_spec/function/everything_long/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_spec/function/everything_long/doc-baseline.json @@ -1,846 +1,846 @@ -{ - "id": 104, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "AAAAAAAAAAAA" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 23, - "kind": "text", - "text": ";" - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 43, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "text", - "text": "BBBBBBBBBBBB" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": " :" - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 41, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 45, - "kind": "text", - "text": ";" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "text", - "text": "CCCCCCCCCCCC" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "text", - "text": " :" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 63, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 67, - "kind": "text", - "text": ";" - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 87, - "kind": "list", - "list": [ - { - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "text", - "text": "DDDDDDDDDDDD" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 71, - "kind": "text", - "text": " :" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 73, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 82, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 85, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 84, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 83, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 91, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 99, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 98, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 97, - "kind": "list", - "list": [ - { - "id": 95, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "text", - "text": "return Freeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeed" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } -} +{ + "id": 104, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 103, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foo" + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "AAAAAAAAAAAA" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 23, + "kind": "text", + "text": ";" + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "text", + "text": "BBBBBBBBBBBB" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": " :" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 41, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 45, + "kind": "text", + "text": ";" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "text", + "text": "CCCCCCCCCCCC" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "text", + "text": " :" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 63, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 67, + "kind": "text", + "text": ";" + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "text", + "text": "DDDDDDDDDDDD" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 71, + "kind": "text", + "text": " :" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 73, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 86, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 82, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 85, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 91, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 99, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 98, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 97, + "kind": "list", + "list": [ + { + "id": 95, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 96, + "kind": "text", + "text": "return Freeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeed" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } +} diff --git a/testsuite/tests/unparsing/subp_spec/function/everything_short/doc-baseline.json b/testsuite/tests/unparsing/subp_spec/function/everything_short/doc-baseline.json index 5372afa7b..64d6c06c2 100644 --- a/testsuite/tests/unparsing/subp_spec/function/everything_short/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_spec/function/everything_short/doc-baseline.json @@ -1,846 +1,846 @@ -{ - "id": 104, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "A" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 23, - "kind": "text", - "text": ";" - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 43, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": " :" - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 41, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 45, - "kind": "text", - "text": ";" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "text", - "text": "C" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "text", - "text": " :" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 63, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 67, - "kind": "text", - "text": ";" - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 87, - "kind": "list", - "list": [ - { - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "text", - "text": "D" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 71, - "kind": "text", - "text": " :" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 73, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 82, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 85, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 84, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 83, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 91, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 99, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 98, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 97, - "kind": "list", - "list": [ - { - "id": 95, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "text", - "text": "return Fred" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } -} +{ + "id": 104, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 103, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foo" + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "A" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 23, + "kind": "text", + "text": ";" + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": " :" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 41, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 45, + "kind": "text", + "text": ";" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "text", + "text": "C" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "text", + "text": " :" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 63, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 67, + "kind": "text", + "text": ";" + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "text", + "text": "D" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 71, + "kind": "text", + "text": " :" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 73, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 86, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 82, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 85, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 91, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 99, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 98, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 97, + "kind": "list", + "list": [ + { + "id": 95, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 96, + "kind": "text", + "text": "return Fred" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } +} diff --git a/testsuite/tests/unparsing/subp_spec/function/long_name/doc-baseline.json b/testsuite/tests/unparsing/subp_spec/function/long_name/doc-baseline.json index 665f5682d..81a089f75 100644 --- a/testsuite/tests/unparsing/subp_spec/function/long_name/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_spec/function/long_name/doc-baseline.json @@ -1,846 +1,846 @@ -{ - "id": 104, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Fooooooo" - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "AAAA" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 23, - "kind": "text", - "text": ";" - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 43, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "text", - "text": "BBBB" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": " :" - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 41, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 45, - "kind": "text", - "text": ";" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "text", - "text": "CCCC" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "text", - "text": " :" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 63, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 67, - "kind": "text", - "text": ";" - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 87, - "kind": "list", - "list": [ - { - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "text", - "text": "DDDD" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 71, - "kind": "text", - "text": " :" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 73, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 82, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 85, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 84, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 83, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 91, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 99, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 98, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 97, - "kind": "list", - "list": [ - { - "id": 95, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "text", - "text": "return Fred" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } -} +{ + "id": 104, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 103, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Fooooooo" + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "AAAA" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 23, + "kind": "text", + "text": ";" + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "text", + "text": "BBBB" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": " :" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 41, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 45, + "kind": "text", + "text": ";" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "text", + "text": "CCCC" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "text", + "text": " :" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 63, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 67, + "kind": "text", + "text": ";" + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "text", + "text": "DDDD" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 71, + "kind": "text", + "text": " :" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 73, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 86, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 82, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 85, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 91, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 99, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 98, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 97, + "kind": "list", + "list": [ + { + "id": 95, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 96, + "kind": "text", + "text": "return Fred" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } +} diff --git a/testsuite/tests/unparsing/subp_spec/function/long_no_params/doc-baseline.json b/testsuite/tests/unparsing/subp_spec/function/long_no_params/doc-baseline.json index 58c1774a7..26c0fad89 100644 --- a/testsuite/tests/unparsing/subp_spec/function/long_no_params/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_spec/function/long_no_params/doc-baseline.json @@ -1,90 +1,90 @@ -{ - "id": 10, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 7, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 6, - "kind": "list", - "list": [ - { - "id": 5, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 2, - "kind": "text", - "text": "return Freeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeed" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } -} +{ + "id": 10, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foo" + }, + { + "id": 7, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 6, + "kind": "list", + "list": [ + { + "id": 5, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 2, + "kind": "text", + "text": "return Freeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeed" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } +} diff --git a/testsuite/tests/unparsing/subp_spec/function/long_params/doc-baseline.json b/testsuite/tests/unparsing/subp_spec/function/long_params/doc-baseline.json index dbf0ead3c..933fb1f72 100644 --- a/testsuite/tests/unparsing/subp_spec/function/long_params/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_spec/function/long_params/doc-baseline.json @@ -1,846 +1,846 @@ -{ - "id": 104, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "AAAAAAAAAAAA" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 23, - "kind": "text", - "text": ";" - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 43, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "text", - "text": "BBBBBBBBBBBB" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": " :" - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 41, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 45, - "kind": "text", - "text": ";" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "text", - "text": "CCCCCCCCCCCC" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "text", - "text": " :" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 63, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 67, - "kind": "text", - "text": ";" - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 87, - "kind": "list", - "list": [ - { - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "text", - "text": "DDDDDDDDDDDD" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 71, - "kind": "text", - "text": " :" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 73, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 82, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 85, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 84, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 83, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 91, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 99, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 98, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 97, - "kind": "list", - "list": [ - { - "id": 95, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "text", - "text": "return Fred" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } -} +{ + "id": 104, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 103, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foo" + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "AAAAAAAAAAAA" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 23, + "kind": "text", + "text": ";" + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "text", + "text": "BBBBBBBBBBBB" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": " :" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 41, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 45, + "kind": "text", + "text": ";" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "text", + "text": "CCCCCCCCCCCC" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "text", + "text": " :" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 63, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 67, + "kind": "text", + "text": ";" + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "text", + "text": "DDDDDDDDDDDD" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 71, + "kind": "text", + "text": " :" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 73, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 86, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 82, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 85, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 91, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 99, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 98, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 97, + "kind": "list", + "list": [ + { + "id": 95, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 96, + "kind": "text", + "text": "return Fred" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } +} diff --git a/testsuite/tests/unparsing/subp_spec/function/long_return/doc-baseline.json b/testsuite/tests/unparsing/subp_spec/function/long_return/doc-baseline.json index 9e80c2d1c..ab171e8da 100644 --- a/testsuite/tests/unparsing/subp_spec/function/long_return/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_spec/function/long_return/doc-baseline.json @@ -1,846 +1,846 @@ -{ - "id": 104, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "AAAA" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 23, - "kind": "text", - "text": ";" - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 43, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "text", - "text": "BBBB" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": " :" - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 41, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 45, - "kind": "text", - "text": ";" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "text", - "text": "CCCC" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "text", - "text": " :" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 63, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 67, - "kind": "text", - "text": ";" - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 87, - "kind": "list", - "list": [ - { - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "text", - "text": "DDDD" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 71, - "kind": "text", - "text": " :" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 73, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 82, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 85, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 84, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 83, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 91, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 99, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 98, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 97, - "kind": "list", - "list": [ - { - "id": 95, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "text", - "text": "return Freeeeeed" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } -} +{ + "id": 104, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 103, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "function Foo" + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "AAAA" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 23, + "kind": "text", + "text": ";" + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "text", + "text": "BBBB" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": " :" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 41, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 45, + "kind": "text", + "text": ";" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "text", + "text": "CCCC" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "text", + "text": " :" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 63, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 67, + "kind": "text", + "text": ";" + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "text", + "text": "DDDD" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 71, + "kind": "text", + "text": " :" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 73, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 86, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 82, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 85, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 91, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 99, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 98, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 97, + "kind": "list", + "list": [ + { + "id": 95, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 96, + "kind": "text", + "text": "return Freeeeeed" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } +} diff --git a/testsuite/tests/unparsing/subp_spec/procedure/everything_short/doc-baseline.json b/testsuite/tests/unparsing/subp_spec/procedure/everything_short/doc-baseline.json index 32c891c78..b933d10af 100644 --- a/testsuite/tests/unparsing/subp_spec/procedure/everything_short/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_spec/procedure/everything_short/doc-baseline.json @@ -1,804 +1,804 @@ -{ - "id": 99, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 98, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 97, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "procedure Foo" - }, - { - "id": 96, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 95, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 22, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 21, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "A" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "text", - "text": "Bar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 20, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 16, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 23, - "kind": "text", - "text": ";" - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 44, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 43, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 34, - "kind": "list", - "list": [ - { - "id": 26, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 25, - "kind": "text", - "text": "B" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "text", - "text": " :" - }, - { - "id": 33, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 32, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 30, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "text", - "text": "Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 41, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 45, - "kind": "text", - "text": ";" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "text", - "text": "C" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "text", - "text": " :" - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "text", - "text": "Qux" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 63, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 67, - "kind": "text", - "text": ";" - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 87, - "kind": "list", - "list": [ - { - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "text", - "text": "D" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 71, - "kind": "text", - "text": " :" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 73, - "kind": "text", - "text": "Corge" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 82, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 81, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 80, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 85, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 84, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 83, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 91, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } -} +{ + "id": 99, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 98, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 97, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "procedure Foo" + }, + { + "id": 96, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 95, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 22, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 21, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "A" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "text", + "text": "Bar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 20, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 16, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 23, + "kind": "text", + "text": ";" + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 34, + "kind": "list", + "list": [ + { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "kind": "text", + "text": "B" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "text", + "text": " :" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 32, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "text", + "text": "Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 41, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 45, + "kind": "text", + "text": ";" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "text", + "text": "C" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "text", + "text": " :" + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "text", + "text": "Qux" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 63, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 67, + "kind": "text", + "text": ";" + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "text", + "text": "D" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 71, + "kind": "text", + "text": " :" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 73, + "kind": "text", + "text": "Corge" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 86, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 82, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 85, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 91, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } +}