Skip to content

Commit

Permalink
Merge branch 'issue_1340' into 'master'
Browse files Browse the repository at this point in the history 
Unparsing: add configuration for AspectAssoc

Closes #1340

See merge request eng/libadalang/libadalang!1609
  • Loading branch information
@joaopsazevedo
joaopsazevedo committed Apr 4, 2024
2 parents b813c12 + 05aea88 commit 6e28b8f
Show file tree
Hide file tree
Showing 48 changed files with 19,951 additions and 18,717 deletions.
30 changes: 30 additions & 0 deletions extensions/default_unparsing_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,36 @@
"whitespace"
]
},
"AspectAssoc": {
"node": {
"kind": "group",
"document": {
"kind": "align",
"width": 2,
"contents": [
{
"kind": "recurse_field",
"field": "f_id"
},
{
"kind": "recurse_field",
"field": "f_expr"
}
]
}
},
"fields": {
"f_expr": [
"whitespace",
{
"kind": "text",
"text": "=>"
},
"line",
"recurse"
]
}
},
"ArrayTypeDef": {
"node": {
"kind": "group",
Expand Down
155 changes: 123 additions & 32 deletions testsuite/tests/unparsing/aspect_spec/multiple_long_aspects/doc-baseline.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"id": 33,
"id": 44,
"kind": "list",
"list": [
{
"id": 21,
"id": 32,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 20,
"id": 31,
"kind": "list",
"list": [
{
Expand All @@ -18,7 +18,7 @@
"text": "package Foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo"
},
{
"id": 17,
"id": 28,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -27,7 +27,7 @@
"n": 2
},
"alignContents": {
"id": 16,
"id": 27,
"kind": "list",
"list": [
{
Expand All @@ -54,13 +54,13 @@
]
},
{
"id": 15,
"id": 26,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 14,
"id": 25,
"kind": "list",
"list": [
{
Expand All @@ -69,7 +69,7 @@
"text": "with"
},
{
"id": 13,
"id": 24,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -78,13 +78,13 @@
"n": 2
},
"alignContents": {
"id": 12,
"id": 23,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 11,
"id": 22,
"kind": "list",
"list": [
{
Expand All @@ -98,12 +98,44 @@
}
},
{
"id": 6,
"id": 9,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 8,
"kind": "command",
"command": {
"command": "align",
"alignData": {
"kind": "width",
"n": 2
},
"alignContents": {
"id": 7,
"kind": "list",
"list": [
{
"id": 6,
"kind": "text",
"text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar"
}
]
}
}
},
"break": false,
"expandedStates": null
}
},
{
"id": 10,
"kind": "text",
"text": "Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar,"
"text": ","
},
{
"id": 7,
"id": 11,
"kind": "command",
"command": {
"command": "line",
Expand All @@ -113,12 +145,44 @@
}
},
{
"id": 8,
"id": 15,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 14,
"kind": "command",
"command": {
"command": "align",
"alignData": {
"kind": "width",
"n": 2
},
"alignContents": {
"id": 13,
"kind": "list",
"list": [
{
"id": 12,
"kind": "text",
"text": "Baz"
}
]
}
}
},
"break": false,
"expandedStates": null
}
},
{
"id": 16,
"kind": "text",
"text": "Baz,"
"text": ","
},
{
"id": 9,
"id": 17,
"kind": "command",
"command": {
"command": "line",
Expand All @@ -128,9 +192,36 @@
}
},
{
"id": 10,
"kind": "text",
"text": "Quuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuux"
"id": 21,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 20,
"kind": "command",
"command": {
"command": "align",
"alignData": {
"kind": "width",
"n": 2
},
"alignContents": {
"id": 19,
"kind": "list",
"list": [
{
"id": 18,
"kind": "text",
"text": "Quuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuux"
}
]
}
}
},
"break": false,
"expandedStates": null
}
}
]
},
Expand All @@ -151,7 +242,7 @@
}
},
{
"id": 18,
"id": 29,
"kind": "command",
"command": {
"command": "line",
Expand All @@ -161,7 +252,7 @@
}
},
{
"id": 19,
"id": 30,
"kind": "text",
"text": "is"
}
Expand All @@ -172,26 +263,26 @@
}
},
{
"id": 28,
"id": 39,
"kind": "command",
"command": {
"command": "indent",
"indentContents": {
"id": 27,
"id": 38,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 26,
"id": 37,
"kind": "list",
"list": [
{
"id": 24,
"id": 35,
"kind": "list",
"list": [
{
"id": 22,
"id": 33,
"kind": "command",
"command": {
"command": "line",
Expand All @@ -201,7 +292,7 @@
}
},
{
"id": 23,
"id": 34,
"kind": "command",
"command": {
"command": "breakParent"
Expand All @@ -210,7 +301,7 @@
]
},
{
"id": 25,
"id": 36,
"kind": "text",
"text": "type Corge;"
}
Expand All @@ -223,11 +314,11 @@
}
},
{
"id": 31,
"id": 42,
"kind": "list",
"list": [
{
"id": 29,
"id": 40,
"kind": "command",
"command": {
"command": "line",
Expand All @@ -237,7 +328,7 @@
}
},
{
"id": 30,
"id": 41,
"kind": "command",
"command": {
"command": "breakParent"
Expand All @@ -246,7 +337,7 @@
]
},
{
"id": 32,
"id": 43,
"kind": "text",
"text": "end Foo;"
}
Expand Down
Loading

0 comments on commit 6e28b8f

Please sign in to comment.