Merge branch 'issue_1300' into 'master'

Unparsing: add config for GenericPackageDecl and GenericPackageInternal Closes #1300 See merge request eng/libadalang/libadalang!1564
AdaCore · Mar 1, 2024 · b7fde2d · b7fde2d
2 parents 776344e + 645477b
commit b7fde2d
Show file tree

Hide file tree

Showing 12 changed files with 3,616 additions and 655 deletions.
diff --git a/extensions/default_unparsing_config.json b/extensions/default_unparsing_config.json
@@ -653,20 +653,28 @@
             "text": "generic"
           },
           {
-            "kind": "indent",
-            "contents": [
-              "hardline",
-              {
-                "kind": "group",
-                "break": true,
-                "document": {
-                  "kind": "recurse_field",
-                  "field": "f_decls"
-                }
-              }
-            ]
+            "kind": "group",
+            "document": {
+              "kind": "recurse_field",
+              "field": "f_decls"
+            }
           }
         ]
+      },
+      "fields": {
+        "f_decls": {
+          "kind": "ifEmpty",
+          "then": "recurse",
+          "else": [
+            {
+              "kind": "indent",
+              "contents": [
+                "hardline",
+                "recurse"
+              ]
+            }
+          ]
+        }
       }
     },
     "GenericFormalSubpDecl": {
@@ -700,6 +708,100 @@
         ]
       }
     },
+    "GenericPackageDecl": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "recurse_field",
+            "field": "f_formal_part"
+          },
+          "hardline",
+          {
+            "kind": "recurse_field",
+            "field": "f_package_decl"
+          }
+        ]
+      }
+    },
+    "GenericPackageInternal": {
+      "node": [
+        {
+          "kind": "group",
+          "document": [
+            {
+              "kind": "group",
+              "document": {
+                "kind": "group",
+                "document": [
+                  {
+                    "kind": "text",
+                    "text": "package"
+                  },
+                  "whitespace",
+                  {
+                    "kind": "recurse_field",
+                    "field": "f_package_name"
+                  },
+                  {
+                    "kind": "align",
+                    "width": 2,
+                    "contents": {
+                      "kind": "recurse_field",
+                      "field": "f_aspects"
+                    }
+                  }
+                ]
+              }
+            },
+            "line",
+            {
+              "kind": "text",
+              "text": "is"
+            }
+          ]
+        },
+        {
+          "kind": "indent",
+          "contents": [
+            "hardline",
+            {
+              "kind": "recurse_field",
+              "field": "f_public_part"
+            }
+          ]
+        },
+        "hardline",
+        {
+          "kind": "recurse_field",
+          "field": "f_private_part"
+        },
+        {
+          "kind": "text",
+          "text": "end"
+        },
+        {
+          "kind": "recurse_field",
+          "field": "f_end_name"
+        },
+        {
+          "kind": "text",
+          "text": ";"
+        }
+      ],
+      "fields": {
+        "f_private_part": [
+          {
+            "kind": "indent",
+            "contents": [
+              "hardline",
+              "recurse"
+            ]
+          },
+          "hardline"
+        ]
+      }
+    },
     "IfStmt": {
       "node": {
         "kind": "group",