diff --git a/extensions/default_unparsing_config.json b/extensions/default_unparsing_config.json index 878f84435..eed395864 100644 --- a/extensions/default_unparsing_config.json +++ b/extensions/default_unparsing_config.json @@ -1021,6 +1021,88 @@ ] } }, + "EntryBody": { + "node": { + "kind": "group", + "document": [ + { + "kind": "text", + "text": "entry" + }, + "whitespace", + { + "kind": "recurse_field", + "field": "f_entry_name" + }, + { + "kind": "recurse_field", + "field": "f_index_spec" + }, + { + "kind": "recurse_field", + "field": "f_params" + }, + { + "kind": "recurse_field", + "field": "f_aspects" + }, + "whitespace", + { + "kind": "text", + "text": "when" + }, + { + "kind": "recurse_field", + "field": "f_barrier" + }, + "hardlineWithoutBreakParent", + { + "kind": "text", + "text": "is" + }, + { + "kind": "recurse_field", + "field": "f_decls" + }, + { + "kind": "text", + "text": "begin" + }, + { + "kind": "recurse_field", + "field": "f_stmts" + }, + "hardlineWithoutBreakParent", + { + "kind": "text", + "text": "end" + }, + { + "kind": "recurse_field", + "field": "f_end_name" + }, + { + "kind": "text", + "text": ";" + } + ] + }, + "fields": { + "f_aspects": [ + "hardline", + "recurse" + ], + "f_decls": [ + { + "kind": "indent", + "contents": [ + "recurse" + ] + }, + "hardlineWithoutBreakParent" + ] + } + }, "EnumLiteralDeclList": { "sep": [ "recurse", @@ -2905,6 +2987,183 @@ "hardline" ] }, + "ProtectedBody": { + "node": [ + { + "kind": "group", + "document": [ + { + "kind": "text", + "text": "protected" + }, + "whitespace", + { + "kind": "text", + "text": "body" + }, + "whitespace", + { + "kind": "recurse_field", + "field": "f_name" + }, + { + "kind": "recurse_field", + "field": "f_aspects" + }, + "line", + { + "kind": "text", + "text": "is" + } + ] + }, + { + "kind": "indent", + "contents": [ + { + "kind": "recurse_field", + "field": "f_decls" + } + ] + }, + "hardline", + { + "kind": "text", + "text": "end" + }, + { + "kind": "recurse_field", + "field": "f_end_name" + }, + { + "kind": "text", + "text": ";" + } + ], + "fields": { + "f_aspects": { + "kind": "align", + "width": 2, + "contents": [ + "hardline", + "recurse" + ] + } + } + }, + "ProtectedDef": { + "node": { + "kind": "group", + "document": [ + { + "kind": "indent", + "contents": [ + { + "kind": "recurse_field", + "field": "f_public_part" + } + ] + }, + "hardline", + { + "kind": "recurse_field", + "field": "f_private_part" + }, + { + "kind": "text", + "text": "end" + }, + "whitespace", + { + "kind": "recurse_field", + "field": "f_end_name" + } + ] + }, + "fields": { + "f_private_part": { + "kind": "ifEmpty", + "then": "recurse", + "else": [ + { + "kind": "indent", + "contents": "recurse" + }, + "hardline" + ] + } + } + }, + "ProtectedTypeDecl": { + "node": { + "kind": "group", + "document": [ + { + "kind": "group", + "document": [ + { + "kind": "text", + "text": "protected" + }, + { + "kind": "text", + "text": "type" + }, + "whitespace", + { + "kind": "recurse_field", + "field": "f_name" + }, + { + "kind": "recurse_field", + "field": "f_discriminants" + }, + { + "kind": "recurse_field", + "field": "f_aspects" + }, + "line", + { + "kind": "text", + "text": "is" + } + ] + }, + { + "kind": "group", + "document": [ + { + "kind": "recurse_field", + "field": "f_interfaces" + } + ] + }, + { + "kind": "recurse_field", + "field": "f_definition" + }, + { + "kind": "text", + "text": ";" + } + ] + }, + "fields": { + "f_discriminants": { + "kind": "align", + "width": 2, + "contents": "recurse" + }, + "f_aspects": { + "kind": "align", + "width": 2, + "contents": [ + "hardline", + "recurse" + ] + } + } + }, "RangeSpec": { "node": { "kind": "align", @@ -3027,6 +3286,63 @@ "field": "f_range" } }, + "SingleProtectedDecl": { + "node": { + "kind": "group", + "document": [ + { + "kind": "group", + "document": [ + { + "kind": "text", + "text": "protected" + }, + "whitespace", + { + "kind": "recurse_field", + "field": "f_name" + }, + { + "kind": "recurse_field", + "field": "f_aspects" + }, + "line", + { + "kind": "text", + "text": "is" + } + ] + }, + { + "kind": "group", + "document": [ + { + "kind": "recurse_field", + "field": "f_interfaces" + } + ] + }, + { + "kind": "recurse_field", + "field": "f_definition" + }, + { + "kind": "text", + "text": ";" + } + ] + }, + "fields": { + "f_aspects": { + "kind": "align", + "width": 2, + "contents": [ + "hardline", + "recurse" + ] + } + } + }, "StmtList": { "sep": [ "recurse", @@ -3147,7 +3463,6 @@ "kind": "recurse_field", "field": "f_subp_name" }, - "line", { "kind": "group", "document": [ @@ -3180,6 +3495,14 @@ "recurse" ] } + }, + "f_subp_params": { + "kind": "ifEmpty", + "then": "recurse", + "else": [ + "line", + "recurse" + ] } } }, 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 6b1aef342..3059c1d03 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,626 @@ -{ - "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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "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": 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 + } +} 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 db9381bc3..3968e8dc2 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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "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 0a99dfa22..6ef75990b 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,626 @@ -{ - "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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "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": 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 + } +} diff --git a/testsuite/tests/unparsing/expr_function/short/doc-baseline.json b/testsuite/tests/unparsing/expr_function/short/doc-baseline.json index 2fcf41b37..ee53861ae 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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "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 5b5e9e64e..441ca782a 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,626 @@ -{ - "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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "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": 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 + } +} diff --git a/testsuite/tests/unparsing/generic_formal_subp_decl/doc-baseline.json b/testsuite/tests/unparsing/generic_formal_subp_decl/doc-baseline.json index 149f69501..5b549638d 100644 --- a/testsuite/tests/unparsing/generic_formal_subp_decl/doc-baseline.json +++ b/testsuite/tests/unparsing/generic_formal_subp_decl/doc-baseline.json @@ -1,115 +1,105 @@ -{ - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "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": 0, - "kind": "text", - "text": "with" - }, - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 8, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 7, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 6, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "text", - "text": "procedure Foo" - }, - { - "id": 3, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 5, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 4, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 9, - "kind": "text", - "text": "is Bar;" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "break": false, - "expandedStates": null - } -} +{ + "id": 12, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 9, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "with" + }, + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 7, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 6, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 5, + "kind": "list", + "list": [ + { + "id": 2, + "kind": "text", + "text": "procedure Foo" + }, + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 8, + "kind": "text", + "text": " is Bar;" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "break": false, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/generic_package_decl/empty_formal_part/doc-baseline.json b/testsuite/tests/unparsing/generic_package_decl/empty_formal_part/doc-baseline.json index f8a31585c..8d02863ea 100644 --- a/testsuite/tests/unparsing/generic_package_decl/empty_formal_part/doc-baseline.json +++ b/testsuite/tests/unparsing/generic_package_decl/empty_formal_part/doc-baseline.json @@ -1,652 +1,652 @@ -{ - "id": 82, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 81, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "generic" - }, - { - "id": 2, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 1, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 7, - "kind": "list", - "list": [ - { - "id": 5, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 6, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 24, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 23, - "kind": "list", - "list": [ - { - "id": 20, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 19, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 18, - "kind": "list", - "list": [ - { - "id": 8, - "kind": "text", - "text": "package " - }, - { - "id": 15, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 14, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 9, - "kind": "text", - "text": "Corge" - }, - { - "id": 10, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": true, - "hard": false - } - }, - { - "id": 11, - "kind": "text", - "text": ".Fred" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - }, - { - "id": 17, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 16, - "kind": "list", - "list": [ - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 21, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 22, - "kind": "text", - "text": "is" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 67, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 66, - "kind": "list", - "list": [ - { - "id": 27, - "kind": "list", - "list": [ - { - "id": 25, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 26, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "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": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - { - "id": 28, - "kind": "text", - "text": "procedure Garply" - }, - { - "id": 29, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 55, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 54, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 53, - "kind": "list", - "list": [ - { - "id": 30, - "kind": "text", - "text": "(" - }, - { - "id": 51, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 50, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 49, - "kind": "list", - "list": [ - { - "id": 41, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 40, - "kind": "list", - "list": [ - { - "id": 32, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 31, - "kind": "text", - "text": "G" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 33, - "kind": "text", - "text": " :" - }, - { - "id": 39, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 38, - "kind": "list", - "list": [ - { - "id": 34, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "text", - "text": "Foo" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 44, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 43, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 42, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 47, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 46, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 45, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 52, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 63, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - } - }, - { - "id": 71, - "kind": "list", - "list": [ - { - "id": 69, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 70, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 72, - "kind": "text", - "text": "end" - }, - { - "id": 79, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 78, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 77, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 76, - "kind": "list", - "list": [ - { - "id": 73, - "kind": "text", - "text": " GNATfuzz" - }, - { - "id": 74, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": true, - "hard": false - } - }, - { - "id": 75, - "kind": "text", - "text": ".AFL_Seed_Data_Chunks" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - }, - { - "id": 80, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 82, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 81, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "generic" + }, + { + "id": 2, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 1, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 7, + "kind": "list", + "list": [ + { + "id": 5, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 6, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 23, + "kind": "list", + "list": [ + { + "id": 20, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 19, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 18, + "kind": "list", + "list": [ + { + "id": 8, + "kind": "text", + "text": "package " + }, + { + "id": 15, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 14, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 9, + "kind": "text", + "text": "Corge" + }, + { + "id": 10, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": true, + "hard": false + } + }, + { + "id": 11, + "kind": "text", + "text": ".Fred" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + }, + { + "id": 17, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 16, + "kind": "list", + "list": [ + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 21, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 22, + "kind": "text", + "text": "is" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 67, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 66, + "kind": "list", + "list": [ + { + "id": 27, + "kind": "list", + "list": [ + { + "id": 25, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 26, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "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": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "text", + "text": "procedure Garply" + }, + { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 54, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 53, + "kind": "list", + "list": [ + { + "id": 30, + "kind": "text", + "text": "(" + }, + { + "id": 51, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 50, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 49, + "kind": "list", + "list": [ + { + "id": 41, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 40, + "kind": "list", + "list": [ + { + "id": 32, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 31, + "kind": "text", + "text": "G" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 33, + "kind": "text", + "text": " :" + }, + { + "id": 39, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 38, + "kind": "list", + "list": [ + { + "id": 34, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "text", + "text": "Foo" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 44, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 43, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 42, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 47, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 46, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 45, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 52, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 63, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 71, + "kind": "list", + "list": [ + { + "id": 69, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 70, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 72, + "kind": "text", + "text": "end" + }, + { + "id": 79, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 78, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 77, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 76, + "kind": "list", + "list": [ + { + "id": 73, + "kind": "text", + "text": " GNATfuzz" + }, + { + "id": 74, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": true, + "hard": false + } + }, + { + "id": 75, + "kind": "text", + "text": ".AFL_Seed_Data_Chunks" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + }, + { + "id": 80, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/generic_package_decl/non_empty_formal_part/doc-baseline.json b/testsuite/tests/unparsing/generic_package_decl/non_empty_formal_part/doc-baseline.json index c883003c6..1ffb7a7cf 100644 --- a/testsuite/tests/unparsing/generic_package_decl/non_empty_formal_part/doc-baseline.json +++ b/testsuite/tests/unparsing/generic_package_decl/non_empty_formal_part/doc-baseline.json @@ -1,1437 +1,1437 @@ -{ - "id": 179, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 178, - "kind": "list", - "list": [ - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "generic" - }, - { - "id": 99, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 98, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 97, - "kind": "list", - "list": [ - { - "id": 3, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 2, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 46, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 45, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "text", - "text": "with" - }, - { - "id": 5, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "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": [ - { - "id": 6, - "kind": "text", - "text": "function Bar" - }, - { - "id": 7, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - { - "id": 33, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 32, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 31, - "kind": "list", - "list": [ - { - "id": 8, - "kind": "text", - "text": "(" - }, - { - "id": 29, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 28, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 27, - "kind": "list", - "list": [ - { - "id": 19, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 18, - "kind": "list", - "list": [ - { - "id": 10, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 9, - "kind": "text", - "text": "Baz" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 11, - "kind": "text", - "text": " :" - }, - { - "id": 17, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 16, - "kind": "list", - "list": [ - { - "id": 12, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 15, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 14, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "text", - "text": "Foo" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 26, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 22, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 21, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 20, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 25, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 24, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 23, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 30, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 37, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 36, - "kind": "list", - "list": [ - { - "id": 34, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 35, - "kind": "text", - "text": "return Boolean" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 44, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 51, - "kind": "list", - "list": [ - { - "id": 49, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 50, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 96, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 95, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 94, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 93, - "kind": "list", - "list": [ - { - "id": 52, - "kind": "text", - "text": "with" - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 91, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 90, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 89, - "kind": "list", - "list": [ - { - "id": 54, - "kind": "text", - "text": "function Baz" - }, - { - "id": 55, - "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": 81, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 80, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 79, - "kind": "list", - "list": [ - { - "id": 56, - "kind": "text", - "text": "(" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 76, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 75, - "kind": "list", - "list": [ - { - "id": 67, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 66, - "kind": "list", - "list": [ - { - "id": 58, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 57, - "kind": "text", - "text": "Qux" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 59, - "kind": "text", - "text": " :" - }, - { - "id": 65, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 64, - "kind": "list", - "list": [ - { - "id": 60, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 63, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 62, - "kind": "list", - "list": [ - { - "id": 61, - "kind": "text", - "text": "Foo" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 74, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 70, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 69, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 68, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 73, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 72, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 71, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 78, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 86, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 85, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 84, - "kind": "list", - "list": [ - { - "id": 82, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 83, - "kind": "text", - "text": "return Boolean" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 92, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - }, - { - "id": 104, - "kind": "list", - "list": [ - { - "id": 102, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 103, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 121, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 120, - "kind": "list", - "list": [ - { - "id": 117, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 116, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 115, - "kind": "list", - "list": [ - { - "id": 105, - "kind": "text", - "text": "package " - }, - { - "id": 112, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "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": 106, - "kind": "text", - "text": "Corge" - }, - { - "id": 107, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": true, - "hard": false - } - }, - { - "id": 108, - "kind": "text", - "text": ".Fred" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - }, - { - "id": 114, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 113, - "kind": "list", - "list": [ - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 118, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 119, - "kind": "text", - "text": "is" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 165, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 164, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 163, - "kind": "list", - "list": [ - { - "id": 124, - "kind": "list", - "list": [ - { - "id": 122, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 123, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 162, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 161, - "kind": "list", - "list": [ - { - "id": 159, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 158, - "kind": "list", - "list": [ - { - "id": 157, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 156, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 155, - "kind": "list", - "list": [ - { - "id": 125, - "kind": "text", - "text": "procedure Garply" - }, - { - "id": 126, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 154, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 153, - "kind": "list", - "list": [ - { - "id": 152, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 151, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 150, - "kind": "list", - "list": [ - { - "id": 127, - "kind": "text", - "text": "(" - }, - { - "id": 148, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 147, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 146, - "kind": "list", - "list": [ - { - "id": 138, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 137, - "kind": "list", - "list": [ - { - "id": 129, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 128, - "kind": "text", - "text": "G" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 130, - "kind": "text", - "text": " :" - }, - { - "id": 136, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 135, - "kind": "list", - "list": [ - { - "id": 131, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 134, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 133, - "kind": "list", - "list": [ - { - "id": 132, - "kind": "text", - "text": "Foo" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 145, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 141, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 140, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 139, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 144, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 143, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 142, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 149, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 160, - "kind": "text", - "text": ";" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - } - }, - { - "id": 168, - "kind": "list", - "list": [ - { - "id": 166, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 167, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 169, - "kind": "text", - "text": "end" - }, - { - "id": 176, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 175, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 174, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 173, - "kind": "list", - "list": [ - { - "id": 170, - "kind": "text", - "text": " GNATfuzz" - }, - { - "id": 171, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": true, - "hard": false - } - }, - { - "id": 172, - "kind": "text", - "text": ".AFL_Seed_Data_Chunks" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - }, - { - "id": 177, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 179, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 178, + "kind": "list", + "list": [ + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "generic" + }, + { + "id": 99, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 98, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 97, + "kind": "list", + "list": [ + { + "id": 3, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 2, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 46, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 45, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "text", + "text": "with" + }, + { + "id": 5, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "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": [ + { + "id": 6, + "kind": "text", + "text": "function Bar" + }, + { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 32, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 31, + "kind": "list", + "list": [ + { + "id": 8, + "kind": "text", + "text": "(" + }, + { + "id": 29, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 28, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 27, + "kind": "list", + "list": [ + { + "id": 19, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 18, + "kind": "list", + "list": [ + { + "id": 10, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 9, + "kind": "text", + "text": "Baz" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 11, + "kind": "text", + "text": " :" + }, + { + "id": 17, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 16, + "kind": "list", + "list": [ + { + "id": 12, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 15, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 14, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "text", + "text": "Foo" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 26, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 22, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 21, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 20, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 25, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 24, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 23, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 30, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + { + "id": 34, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 35, + "kind": "text", + "text": "return Boolean" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 44, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 51, + "kind": "list", + "list": [ + { + "id": 49, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 50, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 96, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 95, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "kind": "list", + "list": [ + { + "id": 52, + "kind": "text", + "text": "with" + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 91, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 90, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 89, + "kind": "list", + "list": [ + { + "id": 54, + "kind": "text", + "text": "function Baz" + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "list", + "list": [ + { + "id": 55, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 81, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 80, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 79, + "kind": "list", + "list": [ + { + "id": 56, + "kind": "text", + "text": "(" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 76, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 75, + "kind": "list", + "list": [ + { + "id": 67, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 66, + "kind": "list", + "list": [ + { + "id": 58, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 57, + "kind": "text", + "text": "Qux" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 59, + "kind": "text", + "text": " :" + }, + { + "id": 65, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 64, + "kind": "list", + "list": [ + { + "id": 60, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 63, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 62, + "kind": "list", + "list": [ + { + "id": 61, + "kind": "text", + "text": "Foo" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 74, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 70, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 69, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 68, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 73, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 72, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 71, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 78, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 86, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 85, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 84, + "kind": "list", + "list": [ + { + "id": 82, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 83, + "kind": "text", + "text": "return Boolean" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 92, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 104, + "kind": "list", + "list": [ + { + "id": 102, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 103, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 121, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 120, + "kind": "list", + "list": [ + { + "id": 117, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 116, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 115, + "kind": "list", + "list": [ + { + "id": 105, + "kind": "text", + "text": "package " + }, + { + "id": 112, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "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": 106, + "kind": "text", + "text": "Corge" + }, + { + "id": 107, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": true, + "hard": false + } + }, + { + "id": 108, + "kind": "text", + "text": ".Fred" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + }, + { + "id": 114, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 113, + "kind": "list", + "list": [ + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 118, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 119, + "kind": "text", + "text": "is" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 165, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 164, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 163, + "kind": "list", + "list": [ + { + "id": 124, + "kind": "list", + "list": [ + { + "id": 122, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 123, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 162, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 161, + "kind": "list", + "list": [ + { + "id": 159, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 158, + "kind": "list", + "list": [ + { + "id": 157, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 156, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 155, + "kind": "list", + "list": [ + { + "id": 125, + "kind": "text", + "text": "procedure Garply" + }, + { + "id": 154, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 153, + "kind": "list", + "list": [ + { + "id": 126, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 152, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 151, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 150, + "kind": "list", + "list": [ + { + "id": 127, + "kind": "text", + "text": "(" + }, + { + "id": 148, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 147, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 146, + "kind": "list", + "list": [ + { + "id": 138, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 137, + "kind": "list", + "list": [ + { + "id": 129, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 128, + "kind": "text", + "text": "G" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 130, + "kind": "text", + "text": " :" + }, + { + "id": 136, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 135, + "kind": "list", + "list": [ + { + "id": 131, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 134, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 133, + "kind": "list", + "list": [ + { + "id": 132, + "kind": "text", + "text": "Foo" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 145, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 141, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 140, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 139, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 144, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 143, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 142, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 149, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 160, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 168, + "kind": "list", + "list": [ + { + "id": 166, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 167, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 169, + "kind": "text", + "text": "end" + }, + { + "id": 176, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 175, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 174, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 173, + "kind": "list", + "list": [ + { + "id": 170, + "kind": "text", + "text": " GNATfuzz" + }, + { + "id": 171, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": true, + "hard": false + } + }, + { + "id": 172, + "kind": "text", + "text": ".AFL_Seed_Data_Chunks" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + }, + { + "id": 177, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/doc-baseline.json b/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/doc-baseline.json index 6f7033193..c1621a199 100644 --- a/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/doc-baseline.json +++ b/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/doc-baseline.json @@ -1,750 +1,750 @@ -{ - "id": 93, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 92, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "generic" - }, - { - "id": 2, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 1, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 7, - "kind": "list", - "list": [ - { - "id": 5, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 6, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 89, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 88, - "kind": "list", - "list": [ - { - "id": 8, - "kind": "text", - "text": "function Perform_Comparison_Check" - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 87, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 86, - "kind": "list", - "list": [ - { - "id": 80, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 79, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 10, - "kind": "text", - "text": "(" - }, - { - "id": 76, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 75, - "kind": "list", - "list": [ - { - "id": 30, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 29, - "kind": "list", - "list": [ - { - "id": 21, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 20, - "kind": "list", - "list": [ - { - "id": 12, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 11, - "kind": "text", - "text": "Comparing_Value" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 13, - "kind": "text", - "text": " :" - }, - { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "list", - "list": [ - { - "id": 14, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 17, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 16, - "kind": "list", - "list": [ - { - "id": 15, - "kind": "text", - "text": "Foo_Bar_Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 28, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 24, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 23, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 22, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "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": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 31, - "kind": "text", - "text": ";" - }, - { - "id": 32, - "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": 43, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 42, - "kind": "list", - "list": [ - { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "text", - "text": "Rule_Value" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 35, - "kind": "text", - "text": " :" - }, - { - "id": 41, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 40, - "kind": "list", - "list": [ - { - "id": 36, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 39, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 38, - "kind": "list", - "list": [ - { - "id": 37, - "kind": "text", - "text": "Foo_Bar_Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 50, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 46, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 45, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 44, - "kind": "list", - "list": [ - ] - }, - "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": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 53, - "kind": "text", - "text": ";" - }, - { - "id": 54, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 74, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 73, - "kind": "list", - "list": [ - { - "id": 65, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 64, - "kind": "list", - "list": [ - { - "id": 56, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 55, - "kind": "text", - "text": "Logic_Operator" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 57, - "kind": "text", - "text": " :" - }, - { - "id": 63, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 62, - "kind": "list", - "list": [ - { - "id": 58, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 61, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 60, - "kind": "list", - "list": [ - { - "id": 59, - "kind": "text", - "text": "Unbounded_String" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 72, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 68, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 67, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 66, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "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": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 77, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 85, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 84, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 83, - "kind": "list", - "list": [ - { - "id": 81, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 82, - "kind": "text", - "text": "return Boolean" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 91, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 93, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "generic" + }, + { + "id": 2, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 1, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 7, + "kind": "list", + "list": [ + { + "id": 5, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 6, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 89, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 88, + "kind": "list", + "list": [ + { + "id": 8, + "kind": "text", + "text": "function Perform_Comparison_Check" + }, + { + "id": 87, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 86, + "kind": "list", + "list": [ + { + "id": 9, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 80, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 79, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 10, + "kind": "text", + "text": "(" + }, + { + "id": 76, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 75, + "kind": "list", + "list": [ + { + "id": 30, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 29, + "kind": "list", + "list": [ + { + "id": 21, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 20, + "kind": "list", + "list": [ + { + "id": 12, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 11, + "kind": "text", + "text": "Comparing_Value" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 13, + "kind": "text", + "text": " :" + }, + { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "list", + "list": [ + { + "id": 14, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 17, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 16, + "kind": "list", + "list": [ + { + "id": 15, + "kind": "text", + "text": "Foo_Bar_Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 28, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 24, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 23, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 22, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "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": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 31, + "kind": "text", + "text": ";" + }, + { + "id": 32, + "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": 43, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 42, + "kind": "list", + "list": [ + { + "id": 34, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 33, + "kind": "text", + "text": "Rule_Value" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 35, + "kind": "text", + "text": " :" + }, + { + "id": 41, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 40, + "kind": "list", + "list": [ + { + "id": 36, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 39, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 38, + "kind": "list", + "list": [ + { + "id": 37, + "kind": "text", + "text": "Foo_Bar_Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 50, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 46, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 45, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 44, + "kind": "list", + "list": [ + ] + }, + "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": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 53, + "kind": "text", + "text": ";" + }, + { + "id": 54, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 74, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 73, + "kind": "list", + "list": [ + { + "id": 65, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 64, + "kind": "list", + "list": [ + { + "id": 56, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 55, + "kind": "text", + "text": "Logic_Operator" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 57, + "kind": "text", + "text": " :" + }, + { + "id": 63, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 62, + "kind": "list", + "list": [ + { + "id": 58, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 61, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 60, + "kind": "list", + "list": [ + { + "id": 59, + "kind": "text", + "text": "Unbounded_String" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 72, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 68, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 67, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 66, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "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": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 77, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 85, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "kind": "list", + "list": [ + { + "id": 81, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 82, + "kind": "text", + "text": "return Boolean" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 91, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/doc-baseline.json b/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/doc-baseline.json index 38dcb4dda..e38a06c90 100644 --- a/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/doc-baseline.json +++ b/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/doc-baseline.json @@ -1,1373 +1,1373 @@ -{ - "id": 171, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 170, - "kind": "list", - "list": [ - { - "id": 82, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 81, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "generic" - }, - { - "id": 80, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 79, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 3, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 2, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 6, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 5, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "text", - "text": "type Foo_Bar_Baz is private;" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "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": 77, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 76, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 10, - "kind": "text", - "text": "with" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 72, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 71, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 70, - "kind": "list", - "list": [ - { - "id": 12, - "kind": "text", - "text": "function \">\"" - }, - { - "id": 13, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 69, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 68, - "kind": "list", - "list": [ - { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 60, - "kind": "list", - "list": [ - { - "id": 14, - "kind": "text", - "text": "(" - }, - { - "id": 58, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 57, - "kind": "list", - "list": [ - { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "id": 25, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 24, - "kind": "list", - "list": [ - { - "id": 16, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 15, - "kind": "text", - "text": "Left_Left_Left_Left_Left" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 17, - "kind": "text", - "text": " :" - }, - { - "id": 23, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 22, - "kind": "list", - "list": [ - { - "id": 18, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 21, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 20, - "kind": "list", - "list": [ - { - "id": 19, - "kind": "text", - "text": "Foo_Bar_Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 32, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 28, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 27, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 26, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 31, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 30, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 29, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 35, - "kind": "text", - "text": ";" - }, - { - "id": 36, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 56, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 55, - "kind": "list", - "list": [ - { - "id": 47, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 46, - "kind": "list", - "list": [ - { - "id": 38, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 37, - "kind": "text", - "text": "Right_Right_Right_Right_Right" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 39, - "kind": "text", - "text": " :" - }, - { - "id": 45, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 44, - "kind": "list", - "list": [ - { - "id": 40, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 43, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 42, - "kind": "list", - "list": [ - { - "id": 41, - "kind": "text", - "text": "Foo_Bar_Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 54, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 50, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 49, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 48, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 53, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 52, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 51, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 59, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 67, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 63, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 64, - "kind": "text", - "text": "return Boolean" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 73, - "kind": "text", - "text": " is <>;" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - }, - { - "id": 85, - "kind": "list", - "list": [ - { - "id": 83, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 84, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 168, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 167, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 166, - "kind": "list", - "list": [ - { - "id": 86, - "kind": "text", - "text": "function Perform_Comparison_Check" - }, - { - "id": 87, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 165, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 164, - "kind": "list", - "list": [ - { - "id": 158, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 157, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 156, - "kind": "list", - "list": [ - { - "id": 88, - "kind": "text", - "text": "(" - }, - { - "id": 154, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "innerRoot" - }, - "alignContents": { - "id": 153, - "kind": "list", - "list": [ - { - "id": 108, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 107, - "kind": "list", - "list": [ - { - "id": 99, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 98, - "kind": "list", - "list": [ - { - "id": 90, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 89, - "kind": "text", - "text": "Comparing_Value" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 91, - "kind": "text", - "text": " :" - }, - { - "id": 97, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 96, - "kind": "list", - "list": [ - { - "id": 92, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 95, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 94, - "kind": "list", - "list": [ - { - "id": 93, - "kind": "text", - "text": "Foo_Bar_Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 106, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 102, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 105, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 104, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 103, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 109, - "kind": "text", - "text": ";" - }, - { - "id": 110, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 130, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 129, - "kind": "list", - "list": [ - { - "id": 121, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 120, - "kind": "list", - "list": [ - { - "id": 112, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 111, - "kind": "text", - "text": "Rule_Value" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 113, - "kind": "text", - "text": " :" - }, - { - "id": 119, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 118, - "kind": "list", - "list": [ - { - "id": 114, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 117, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 116, - "kind": "list", - "list": [ - { - "id": 115, - "kind": "text", - "text": "Foo_Bar_Baz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 128, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 124, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 123, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 122, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 127, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 126, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 125, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 131, - "kind": "text", - "text": ";" - }, - { - "id": 132, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 152, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 151, - "kind": "list", - "list": [ - { - "id": 143, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 142, - "kind": "list", - "list": [ - { - "id": 134, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 133, - "kind": "text", - "text": "Logic_Operator" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 135, - "kind": "text", - "text": " :" - }, - { - "id": 141, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 140, - "kind": "list", - "list": [ - { - "id": 136, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 139, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 138, - "kind": "list", - "list": [ - { - "id": 137, - "kind": "text", - "text": "Unbounded_String" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 150, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 146, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 145, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 144, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 149, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 148, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 147, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 155, - "kind": "text", - "text": ")" - } - ] - } - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 163, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 162, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 161, - "kind": "list", - "list": [ - { - "id": 159, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 160, - "kind": "text", - "text": "return Boolean" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 169, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 171, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 170, + "kind": "list", + "list": [ + { + "id": 82, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 81, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "generic" + }, + { + "id": 80, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 79, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 3, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 2, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 6, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 5, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "text", + "text": "type Foo_Bar_Baz is private;" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "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": 77, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 76, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 10, + "kind": "text", + "text": "with" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 72, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 71, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 70, + "kind": "list", + "list": [ + { + "id": 12, + "kind": "text", + "text": "function \">\"" + }, + { + "id": 69, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 68, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 60, + "kind": "list", + "list": [ + { + "id": 14, + "kind": "text", + "text": "(" + }, + { + "id": 58, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 57, + "kind": "list", + "list": [ + { + "id": 34, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 33, + "kind": "list", + "list": [ + { + "id": 25, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 24, + "kind": "list", + "list": [ + { + "id": 16, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 15, + "kind": "text", + "text": "Left_Left_Left_Left_Left" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 17, + "kind": "text", + "text": " :" + }, + { + "id": 23, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 22, + "kind": "list", + "list": [ + { + "id": 18, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 21, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 20, + "kind": "list", + "list": [ + { + "id": 19, + "kind": "text", + "text": "Foo_Bar_Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 32, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 28, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 27, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 26, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 31, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 30, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 29, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 35, + "kind": "text", + "text": ";" + }, + { + "id": 36, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 56, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 55, + "kind": "list", + "list": [ + { + "id": 47, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 46, + "kind": "list", + "list": [ + { + "id": 38, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 37, + "kind": "text", + "text": "Right_Right_Right_Right_Right" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 39, + "kind": "text", + "text": " :" + }, + { + "id": 45, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 44, + "kind": "list", + "list": [ + { + "id": 40, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 43, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 42, + "kind": "list", + "list": [ + { + "id": 41, + "kind": "text", + "text": "Foo_Bar_Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 54, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 50, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 49, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 48, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 53, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 52, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 51, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 59, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 67, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 63, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 64, + "kind": "text", + "text": "return Boolean" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 73, + "kind": "text", + "text": " is <>;" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 85, + "kind": "list", + "list": [ + { + "id": 83, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 84, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 168, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 167, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 166, + "kind": "list", + "list": [ + { + "id": 86, + "kind": "text", + "text": "function Perform_Comparison_Check" + }, + { + "id": 165, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 164, + "kind": "list", + "list": [ + { + "id": 87, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 158, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 157, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 156, + "kind": "list", + "list": [ + { + "id": 88, + "kind": "text", + "text": "(" + }, + { + "id": 154, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 153, + "kind": "list", + "list": [ + { + "id": 108, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 107, + "kind": "list", + "list": [ + { + "id": 99, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 98, + "kind": "list", + "list": [ + { + "id": 90, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 89, + "kind": "text", + "text": "Comparing_Value" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 91, + "kind": "text", + "text": " :" + }, + { + "id": 97, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 96, + "kind": "list", + "list": [ + { + "id": 92, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 95, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 94, + "kind": "list", + "list": [ + { + "id": 93, + "kind": "text", + "text": "Foo_Bar_Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 106, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 102, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 105, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 104, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 103, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 109, + "kind": "text", + "text": ";" + }, + { + "id": 110, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 130, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 129, + "kind": "list", + "list": [ + { + "id": 121, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 120, + "kind": "list", + "list": [ + { + "id": 112, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 111, + "kind": "text", + "text": "Rule_Value" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 113, + "kind": "text", + "text": " :" + }, + { + "id": 119, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 118, + "kind": "list", + "list": [ + { + "id": 114, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 117, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 116, + "kind": "list", + "list": [ + { + "id": 115, + "kind": "text", + "text": "Foo_Bar_Baz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 128, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 124, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 123, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 122, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 127, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 126, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 125, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 131, + "kind": "text", + "text": ";" + }, + { + "id": 132, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 152, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 151, + "kind": "list", + "list": [ + { + "id": 143, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 142, + "kind": "list", + "list": [ + { + "id": 134, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 133, + "kind": "text", + "text": "Logic_Operator" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 135, + "kind": "text", + "text": " :" + }, + { + "id": 141, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 140, + "kind": "list", + "list": [ + { + "id": 136, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 139, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 138, + "kind": "list", + "list": [ + { + "id": 137, + "kind": "text", + "text": "Unbounded_String" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 150, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 146, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 145, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 144, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 149, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 148, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 147, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 155, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 163, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 162, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 161, + "kind": "list", + "list": [ + { + "id": 159, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 160, + "kind": "text", + "text": "return Boolean" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 169, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/protected_body/simple_body/doc-baseline.json b/testsuite/tests/unparsing/protected_body/simple_body/doc-baseline.json new file mode 100644 index 000000000..242840464 --- /dev/null +++ b/testsuite/tests/unparsing/protected_body/simple_body/doc-baseline.json @@ -0,0 +1,1429 @@ +{ + "id": 182, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "protected body Shared_Array" + }, + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 2, + "kind": "text", + "text": "is" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 177, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 176, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 175, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "list", + "list": [ + { + "id": 5, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 6, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 80, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 79, + "kind": "list", + "list": [ + { + "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": [ + { + "id": 8, + "kind": "text", + "text": "function Component" + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 41, + "kind": "list", + "list": [ + { + "id": 9, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 35, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 34, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 33, + "kind": "list", + "list": [ + { + "id": 10, + "kind": "text", + "text": "(" + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 30, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 29, + "kind": "list", + "list": [ + { + "id": 21, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 20, + "kind": "list", + "list": [ + { + "id": 12, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 11, + "kind": "text", + "text": "N" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 13, + "kind": "text", + "text": " :" + }, + { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 18, + "kind": "list", + "list": [ + { + "id": 14, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 17, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 16, + "kind": "list", + "list": [ + { + "id": 15, + "kind": "text", + "text": "in Index" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 28, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 24, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 23, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 22, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "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": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 32, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 40, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 39, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 38, + "kind": "list", + "list": [ + { + "id": 36, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 37, + "kind": "text", + "text": "return Item" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 47, + "kind": "text", + "text": "is" + }, + { + "id": 49, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 48, + "kind": "list", + "list": [ + ] + } + } + }, + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 51, + "kind": "text", + "text": "begin" + }, + { + "id": 76, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 75, + "kind": "list", + "list": [ + { + "id": 74, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 73, + "kind": "list", + "list": [ + { + "id": 54, + "kind": "list", + "list": [ + { + "id": 52, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 72, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 71, + "kind": "command", + "command": { + "command": "fill", + "parts": { + "id": 70, + "kind": "list", + "list": [ + { + "id": 55, + "kind": "text", + "text": "return" + }, + { + "id": 56, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 67, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "text", + "text": "Table" + }, + { + "id": 58, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 59, + "kind": "text", + "text": "(" + }, + { + "id": 63, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 62, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 61, + "kind": "list", + "list": [ + { + "id": 60, + "kind": "text", + "text": "N" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 64, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + }, + { + "id": 69, + "kind": "text", + "text": ";" + } + ] + } + } + } + } + } + ] + } + } + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 78, + "kind": "text", + "text": "end Component;" + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 83, + "kind": "list", + "list": [ + { + "id": 81, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 82, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 174, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 173, + "kind": "list", + "list": [ + { + "id": 139, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 138, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 137, + "kind": "list", + "list": [ + { + "id": 84, + "kind": "text", + "text": "procedure Set_Component" + }, + { + "id": 136, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 135, + "kind": "list", + "list": [ + { + "id": 85, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 134, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 133, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 132, + "kind": "list", + "list": [ + { + "id": 86, + "kind": "text", + "text": "(" + }, + { + "id": 130, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 129, + "kind": "list", + "list": [ + { + "id": 106, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 105, + "kind": "list", + "list": [ + { + "id": 97, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 96, + "kind": "list", + "list": [ + { + "id": 88, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 87, + "kind": "text", + "text": "N" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 89, + "kind": "text", + "text": " :" + }, + { + "id": 95, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 94, + "kind": "list", + "list": [ + { + "id": 90, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 93, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 92, + "kind": "list", + "list": [ + { + "id": 91, + "kind": "text", + "text": "in Index" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 104, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 100, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 99, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 98, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 103, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 102, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 101, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 107, + "kind": "text", + "text": ";" + }, + { + "id": 108, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 128, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 127, + "kind": "list", + "list": [ + { + "id": 119, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 118, + "kind": "list", + "list": [ + { + "id": 110, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 109, + "kind": "text", + "text": "E" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 111, + "kind": "text", + "text": " :" + }, + { + "id": 117, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 116, + "kind": "list", + "list": [ + { + "id": 112, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 115, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 114, + "kind": "list", + "list": [ + { + "id": 113, + "kind": "text", + "text": "in Item" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 126, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 122, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 121, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 120, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 125, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 124, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 123, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 131, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 140, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 141, + "kind": "text", + "text": "is" + }, + { + "id": 143, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 142, + "kind": "list", + "list": [ + ] + } + } + }, + { + "id": 144, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 145, + "kind": "text", + "text": "begin" + }, + { + "id": 170, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 169, + "kind": "list", + "list": [ + { + "id": 168, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 167, + "kind": "list", + "list": [ + { + "id": 148, + "kind": "list", + "list": [ + { + "id": 146, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 147, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 166, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 165, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 164, + "kind": "list", + "list": [ + { + "id": 160, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 159, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 158, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 157, + "kind": "list", + "list": [ + { + "id": 149, + "kind": "text", + "text": "Table" + }, + { + "id": 150, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 151, + "kind": "text", + "text": "(" + }, + { + "id": 155, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 154, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 153, + "kind": "list", + "list": [ + { + "id": 152, + "kind": "text", + "text": "N" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 156, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + }, + { + "id": 161, + "kind": "text", + "text": " :=" + }, + { + "id": 162, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 163, + "kind": "text", + "text": "E;" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + } + } + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 171, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 172, + "kind": "text", + "text": "end Set_Component;" + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 180, + "kind": "list", + "list": [ + { + "id": 178, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 179, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 181, + "kind": "text", + "text": "end Shared_Array;" + } + ] +} diff --git a/testsuite/tests/unparsing/protected_body/simple_body/input.ada b/testsuite/tests/unparsing/protected_body/simple_body/input.ada new file mode 100644 index 000000000..923b934ec --- /dev/null +++ b/testsuite/tests/unparsing/protected_body/simple_body/input.ada @@ -0,0 +1,11 @@ +protected body Shared_Array is + function Component(N : in Index) return Item is + begin + return Table(N); + end Component; + + procedure Set_Component(N : in Index; E : in Item) is + begin + Table(N) := E; + end Set_Component; +end Shared_Array; diff --git a/testsuite/tests/unparsing/protected_body/simple_body/test.out b/testsuite/tests/unparsing/protected_body/simple_body/test.out new file mode 100644 index 000000000..7887a5184 --- /dev/null +++ b/testsuite/tests/unparsing/protected_body/simple_body/test.out @@ -0,0 +1,12 @@ +protected body Shared_Array is + function Component (N : in Index) return Item + is + begin + return Table (N); + end Component; + procedure Set_Component (N : in Index; E : in Item) + is + begin + Table (N) := E; + end Set_Component; +end Shared_Array; diff --git a/testsuite/tests/unparsing/protected_body/simple_body/test.yaml b/testsuite/tests/unparsing/protected_body/simple_body/test.yaml new file mode 100644 index 000000000..69db831a2 --- /dev/null +++ b/testsuite/tests/unparsing/protected_body/simple_body/test.yaml @@ -0,0 +1,6 @@ +description: | + This test checks the formatting of a protected type body. + It is expected that the body declarations be indented. + +driver: unparser +rule: protected_body diff --git a/testsuite/tests/unparsing/protected_body/with_entry/doc-baseline.json b/testsuite/tests/unparsing/protected_body/with_entry/doc-baseline.json new file mode 100644 index 000000000..bd5d3b4e5 --- /dev/null +++ b/testsuite/tests/unparsing/protected_body/with_entry/doc-baseline.json @@ -0,0 +1,538 @@ +{ + "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 body 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": 66, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 65, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 64, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "list", + "list": [ + { + "id": 5, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 6, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 30, + "kind": "list", + "list": [ + { + "id": 8, + "kind": "text", + "text": "entry Seize when not Busy" + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 10, + "kind": "text", + "text": "is" + }, + { + "id": 12, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 11, + "kind": "list", + "list": [ + ] + } + } + }, + { + "id": 13, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 14, + "kind": "text", + "text": "begin" + }, + { + "id": 27, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 26, + "kind": "list", + "list": [ + { + "id": 25, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 24, + "kind": "list", + "list": [ + { + "id": 17, + "kind": "list", + "list": [ + { + "id": 15, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 16, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "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": "Busy :=" + }, + { + "id": 19, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 20, + "kind": "text", + "text": "True;" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + } + } + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 29, + "kind": "text", + "text": "end Seize;" + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 34, + "kind": "list", + "list": [ + { + "id": 32, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 63, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 62, + "kind": "list", + "list": [ + { + "id": 40, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 39, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 38, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "text", + "text": "procedure Release" + }, + { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 41, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 42, + "kind": "text", + "text": "is" + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 43, + "kind": "list", + "list": [ + ] + } + } + }, + { + "id": 45, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 46, + "kind": "text", + "text": "begin" + }, + { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 49, + "kind": "list", + "list": [ + { + "id": 47, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "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": 50, + "kind": "text", + "text": "Busy :=" + }, + { + "id": 51, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 52, + "kind": "text", + "text": "False;" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + } + } + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 60, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 61, + "kind": "text", + "text": "end Release;" + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 69, + "kind": "list", + "list": [ + { + "id": 67, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 70, + "kind": "text", + "text": "end Resource;" + } + ] +} diff --git a/testsuite/tests/unparsing/protected_body/with_entry/input.ada b/testsuite/tests/unparsing/protected_body/with_entry/input.ada new file mode 100644 index 000000000..7bbfbb26c --- /dev/null +++ b/testsuite/tests/unparsing/protected_body/with_entry/input.ada @@ -0,0 +1,11 @@ +protected body Resource is + entry Seize when not Busy is + begin + Busy := True; + end Seize; + + procedure Release is + begin + Busy := False; + end Release; +end Resource; diff --git a/testsuite/tests/unparsing/protected_body/with_entry/test.out b/testsuite/tests/unparsing/protected_body/with_entry/test.out new file mode 100644 index 000000000..c3edd625b --- /dev/null +++ b/testsuite/tests/unparsing/protected_body/with_entry/test.out @@ -0,0 +1,12 @@ +protected body Resource is + entry Seize when not Busy + is + begin + Busy := True; + end Seize; + procedure Release + is + begin + Busy := False; + end Release; +end Resource; diff --git a/testsuite/tests/unparsing/protected_body/with_entry/test.yaml b/testsuite/tests/unparsing/protected_body/with_entry/test.yaml new file mode 100644 index 000000000..69db831a2 --- /dev/null +++ b/testsuite/tests/unparsing/protected_body/with_entry/test.yaml @@ -0,0 +1,6 @@ +description: | + This test checks the formatting of a protected type body. + It is expected that the body declarations be indented. + +driver: unparser +rule: protected_body 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 new file mode 100644 index 000000000..8574e9bf3 --- /dev/null +++ b/testsuite/tests/unparsing/protected_type_decl/with_aspects/doc-baseline.json @@ -0,0 +1,748 @@ +{ + "id": 94, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 93, + "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": 91, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 90, + "kind": "list", + "list": [ + { + "id": 85, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 84, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 83, + "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": 78, + "kind": "text", + "text": "entry Fill;" + }, + { + "id": 81, + "kind": "list", + "list": [ + { + "id": 79, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 80, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 82, + "kind": "text", + "text": "entry Drain;" + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 88, + "kind": "list", + "list": [ + { + "id": 86, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 87, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 89, + "kind": "text", + "text": "end Worker" + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 92, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/protected_type_decl/with_aspects/input.ada b/testsuite/tests/unparsing/protected_type_decl/with_aspects/input.ada new file mode 100644 index 000000000..f5af3a282 --- /dev/null +++ b/testsuite/tests/unparsing/protected_type_decl/with_aspects/input.ada @@ -0,0 +1,5 @@ +protected type Worker(Priority_Level : System.Priority; Buffer_Parameter : access Buffer) + with Priority => Prio is + entry Fill; + entry Drain; +end Worker; diff --git a/testsuite/tests/unparsing/protected_type_decl/with_aspects/test.out b/testsuite/tests/unparsing/protected_type_decl/with_aspects/test.out new file mode 100644 index 000000000..c918fb364 --- /dev/null +++ b/testsuite/tests/unparsing/protected_type_decl/with_aspects/test.out @@ -0,0 +1,7 @@ +protected type Worker + (Priority_Level : System.Priority; Buffer_Parameter : access Buffer) + with Priority=>Prio +is + entry Fill; + entry Drain; +end Worker; diff --git a/testsuite/tests/unparsing/protected_type_decl/with_aspects/test.yaml b/testsuite/tests/unparsing/protected_type_decl/with_aspects/test.yaml new file mode 100644 index 000000000..524130ffb --- /dev/null +++ b/testsuite/tests/unparsing/protected_type_decl/with_aspects/test.yaml @@ -0,0 +1,11 @@ +description: | + This test checks the formatting of a protected type declaration + with known discriminant, aspects and public. + It is expected the declaration breaks before the discriminant + specification, before `with` and `is` keywords and be formatted + by indenting the discriminant specification, the aspects and the + public part content and keeping the `protected`, `is` and `end` + keywords aligned. + +driver: unparser +rule: protected_type_decl 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 new file mode 100644 index 000000000..5cc834547 --- /dev/null +++ b/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/doc-baseline.json @@ -0,0 +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 + } +} diff --git a/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/input.ada b/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/input.ada new file mode 100644 index 000000000..89a15c7b4 --- /dev/null +++ b/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/input.ada @@ -0,0 +1,6 @@ +protected type Buffer (Nb_Elements_In_Buffer : Integer := 100; Need_To_Activate_All : Boolean := False) is + procedure Activate; + procedure Release; +private + Busy : Boolean := False; +end Buffer; diff --git a/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/test.out b/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/test.out new file mode 100644 index 000000000..0a1a38132 --- /dev/null +++ b/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/test.out @@ -0,0 +1,9 @@ +protected type Buffer + (Nb_Elements_In_Buffer : Integer := 100; + Need_To_Activate_All : Boolean := False) +is + procedure Activate; + procedure Release; +private + Busy : Boolean := False; +end Buffer; diff --git a/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/test.yaml b/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/test.yaml new file mode 100644 index 000000000..4264f2213 --- /dev/null +++ b/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/test.yaml @@ -0,0 +1,10 @@ +description: | + This test checks the formatting of a protected type declaration + with known discriminant and public and private part. + It is expected the declaration breaks before the discriminant + specification, after `is` keyword and be formatted by indenting + the discriminant specificatin, public and private part content and + keeping the `protected`, `is`, `private` and `end` keywords aligned. + +driver: unparser +rule: protected_type_decl 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 new file mode 100644 index 000000000..985515a90 --- /dev/null +++ b/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/doc-baseline.json @@ -0,0 +1,475 @@ +{ + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "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": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + { + "id": 27, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 26, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 25, + "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": 10, + "kind": "text", + "text": "entry Seize;" + }, + { + "id": 13, + "kind": "list", + "list": [ + { + "id": 11, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 12, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 24, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 23, + "kind": "list", + "list": [ + { + "id": 21, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 20, + "kind": "list", + "list": [ + { + "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": [ + { + "id": 14, + "kind": "text", + "text": "procedure Release" + }, + { + "id": 16, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 15, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 22, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 30, + "kind": "list", + "list": [ + { + "id": 28, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 29, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 31, + "kind": "text", + "text": "private" + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 52, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 51, + "kind": "list", + "list": [ + { + "id": 34, + "kind": "list", + "list": [ + { + "id": 32, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 50, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 49, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 48, + "kind": "list", + "list": [ + { + "id": 36, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 35, + "kind": "text", + "text": "Busy" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 37, + "kind": "text", + "text": " :" + }, + { + "id": 38, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 47, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 46, + "kind": "list", + "list": [ + { + "id": 42, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 41, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 40, + "kind": "list", + "list": [ + { + "id": 39, + "kind": "text", + "text": "Boolean" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 43, + "kind": "text", + "text": " :=" + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 45, + "kind": "text", + "text": "False;" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 56, + "kind": "list", + "list": [ + { + "id": 54, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 57, + "kind": "text", + "text": "end Resource" + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 60, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/input.ada b/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/input.ada new file mode 100644 index 000000000..4b2279dac --- /dev/null +++ b/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/input.ada @@ -0,0 +1,6 @@ +protected type Resource is + entry Seize; + procedure Release; +private + Busy : Boolean := False; +end Resource; diff --git a/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/test.out b/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/test.out new file mode 100644 index 000000000..4b2279dac --- /dev/null +++ b/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/test.out @@ -0,0 +1,6 @@ +protected type Resource is + entry Seize; + procedure Release; +private + Busy : Boolean := False; +end Resource; diff --git a/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/test.yaml b/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/test.yaml new file mode 100644 index 000000000..694f5f9bf --- /dev/null +++ b/testsuite/tests/unparsing/protected_type_decl/with_public_and_private_part/test.yaml @@ -0,0 +1,9 @@ +description: | + This test checks the formatting of a protected type declaration + with public and private part. + It is expected the declaration breaks after `is` and be formatted + by indenting the public and private part content and keeping the + `protected`, `private` and `end` keywords aligned. + +driver: unparser +rule: protected_type_decl diff --git a/testsuite/tests/unparsing/single_protected_decl/doc-baseline.json b/testsuite/tests/unparsing/single_protected_decl/doc-baseline.json new file mode 100644 index 000000000..af9805d72 --- /dev/null +++ b/testsuite/tests/unparsing/single_protected_decl/doc-baseline.json @@ -0,0 +1,1334 @@ +{ + "id": 169, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 168, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "protected Shared_Array" + }, + { + "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": 166, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 165, + "kind": "list", + "list": [ + { + "id": 119, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 118, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 117, + "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": 52, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 51, + "kind": "list", + "list": [ + { + "id": 49, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 48, + "kind": "list", + "list": [ + { + "id": 47, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 46, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 45, + "kind": "list", + "list": [ + { + "id": 10, + "kind": "text", + "text": "function Component" + }, + { + "id": 44, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 43, + "kind": "list", + "list": [ + { + "id": 11, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 37, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 36, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 35, + "kind": "list", + "list": [ + { + "id": 12, + "kind": "text", + "text": "(" + }, + { + "id": 33, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 32, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 31, + "kind": "list", + "list": [ + { + "id": 23, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 22, + "kind": "list", + "list": [ + { + "id": 14, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 13, + "kind": "text", + "text": "N" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 15, + "kind": "text", + "text": " :" + }, + { + "id": 21, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 20, + "kind": "list", + "list": [ + { + "id": 16, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 19, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 18, + "kind": "list", + "list": [ + { + "id": 17, + "kind": "text", + "text": "in Index" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 30, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 26, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 25, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 24, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "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": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 34, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 41, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 40, + "kind": "list", + "list": [ + { + "id": 38, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 39, + "kind": "text", + "text": "return Item" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 50, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 55, + "kind": "list", + "list": [ + { + "id": 53, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 54, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 116, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 115, + "kind": "list", + "list": [ + { + "id": 113, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 112, + "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": 56, + "kind": "text", + "text": "procedure Set_Component" + }, + { + "id": 108, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 107, + "kind": "list", + "list": [ + { + "id": 57, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 106, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 105, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 104, + "kind": "list", + "list": [ + { + "id": 58, + "kind": "text", + "text": "(" + }, + { + "id": 102, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 101, + "kind": "list", + "list": [ + { + "id": 78, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 77, + "kind": "list", + "list": [ + { + "id": 69, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 68, + "kind": "list", + "list": [ + { + "id": 60, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 59, + "kind": "text", + "text": "N" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 61, + "kind": "text", + "text": " :" + }, + { + "id": 67, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 66, + "kind": "list", + "list": [ + { + "id": 62, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 65, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 64, + "kind": "list", + "list": [ + { + "id": 63, + "kind": "text", + "text": "in Index" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 76, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 72, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 71, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 70, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 75, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 74, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 73, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 79, + "kind": "text", + "text": ";" + }, + { + "id": 80, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 100, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 99, + "kind": "list", + "list": [ + { + "id": 91, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 90, + "kind": "list", + "list": [ + { + "id": 82, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 81, + "kind": "text", + "text": "E" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 83, + "kind": "text", + "text": " :" + }, + { + "id": 89, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 88, + "kind": "list", + "list": [ + { + "id": 84, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 87, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 86, + "kind": "list", + "list": [ + { + "id": 85, + "kind": "text", + "text": "in Item" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 98, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 94, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 93, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 92, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "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": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 103, + "kind": "text", + "text": ")" + } + ] + } + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 114, + "kind": "text", + "text": ";" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 122, + "kind": "list", + "list": [ + { + "id": 120, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 121, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 123, + "kind": "text", + "text": "private" + }, + { + "id": 160, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 159, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 158, + "kind": "list", + "list": [ + { + "id": 126, + "kind": "list", + "list": [ + { + "id": 124, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 125, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 157, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 156, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 155, + "kind": "list", + "list": [ + { + "id": 128, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 127, + "kind": "text", + "text": "Table" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 129, + "kind": "text", + "text": " :" + }, + { + "id": 130, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 154, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 153, + "kind": "list", + "list": [ + { + "id": 134, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 133, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 132, + "kind": "list", + "list": [ + { + "id": 131, + "kind": "text", + "text": "Item_Array(Index)" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 135, + "kind": "text", + "text": " :=" + }, + { + "id": 136, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 151, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 150, + "kind": "list", + "list": [ + { + "id": 137, + "kind": "text", + "text": "(" + }, + { + "id": 148, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 147, + "kind": "list", + "list": [ + { + "id": 146, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 145, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 144, + "kind": "list", + "list": [ + { + "id": 141, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 140, + "kind": "list", + "list": [ + { + "id": 138, + "kind": "text", + "text": "others =>" + }, + { + "id": 139, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + } + ] + } + } + }, + { + "id": 143, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "innerRoot" + }, + "alignContents": { + "id": 142, + "kind": "text", + "text": "Null_Item" + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + } + } + }, + { + "id": 149, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 152, + "kind": "text", + "text": ";" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + } + }, + { + "id": 163, + "kind": "list", + "list": [ + { + "id": 161, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 162, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 164, + "kind": "text", + "text": "end Shared_Array" + } + ] + }, + "break": true, + "expandedStates": null + } + }, + { + "id": 167, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/single_protected_decl/input.ada b/testsuite/tests/unparsing/single_protected_decl/input.ada new file mode 100644 index 000000000..3a5d18a20 --- /dev/null +++ b/testsuite/tests/unparsing/single_protected_decl/input.ada @@ -0,0 +1,6 @@ +protected Shared_Array is + function Component (N : in Index) return Item; + procedure Set_Component(N : in Index; E : in Item); +private + Table : Item_Array(Index) := (others => Null_Item); +end Shared_Array; \ No newline at end of file diff --git a/testsuite/tests/unparsing/single_protected_decl/test.out b/testsuite/tests/unparsing/single_protected_decl/test.out new file mode 100644 index 000000000..e02f8ade8 --- /dev/null +++ b/testsuite/tests/unparsing/single_protected_decl/test.out @@ -0,0 +1,6 @@ +protected Shared_Array is + function Component (N : in Index) return Item; + procedure Set_Component (N : in Index; E : in Item); +private + Table : Item_Array(Index) := (others => Null_Item); +end Shared_Array; diff --git a/testsuite/tests/unparsing/single_protected_decl/test.yaml b/testsuite/tests/unparsing/single_protected_decl/test.yaml new file mode 100644 index 000000000..105a71588 --- /dev/null +++ b/testsuite/tests/unparsing/single_protected_decl/test.yaml @@ -0,0 +1,9 @@ +description: | + This test checks the formatting of a single protected declaration + with private and public part. + It is expected the declaration be formatted by aligning `protected`, + `private` and `end` keywords and the contents of public and private + parts are indented. + +driver: unparser +rule: protected_decl 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 90b8b5a83..245bc828f 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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "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 c619bd48c..0c0f506ca 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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "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 73174ab96..3586631e4 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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "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_decl/long_not_overriding/doc-baseline.json b/testsuite/tests/unparsing/subp_decl/long_not_overriding/doc-baseline.json index 8bbfd2474..207ffbd5f 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": 3, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "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 91d1fd90e..2615779ca 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,969 @@ -{ - "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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "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": 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 + } +} 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 63bd23d20..5a20acbec 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,969 @@ -{ - "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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "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": 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 + } +} 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 b0a9d4a94..8d983b8bc 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": 3, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 103, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 102, - "kind": "list", - "list": [ - { - "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 af9c622c4..84abf57db 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,969 @@ -{ - "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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "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": 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 + } +} 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 869b3431b..74054c376 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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "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 7003a1428..5372afa7b 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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "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 9a0fd9125..665f5682d 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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "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 33b528e28..58c1774a7 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,100 +1,90 @@ -{ - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 9, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "function Foo" - }, - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 8, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 7, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 5, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 4, - "kind": "list", - "list": [ - { - "id": 2, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 3, - "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 b6c10f80b..dbf0ead3c 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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "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 464868e28..9e80c2d1c 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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "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 8a16d6841..32c891c78 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": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 96, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 95, - "kind": "list", - "list": [ - { - "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 + } + } + } +}