Merge branch 'unparsing/inner_root' into 'master'

Add Inner_Root alignment kind

See merge request eng/libadalang/langkit!1007

Author: joaopsazevedo

langkit/support/langkit_support-generic_api-unparsing.adb

@@ -790,7 +790,7 @@ package body Langkit_Support.Generic_API.Unparsing is
                   end;
 
                elsif Kind in
-                  "dedent" | "dedentToRoot" | "markAsRoot"
+                  "dedent" | "dedentToRoot" | "markAsRoot" | "innerRoot"
                then
                   if not JSON.Has_Field ("contents") then
                      Abort_Parsing
@@ -803,6 +803,8 @@ package body Langkit_Support.Generic_API.Unparsing is
                                   then (Kind => Prettier.Dedent_To_Root)
                                   elsif Kind = "markAsRoot"
                                   then (Kind => Prettier.Root)
+                                  elsif Kind = "innerRoot"
+                                  then (Kind => Prettier.Inner_Root)
                                   else raise Program_Error),
                      Contents => Parse_Template_Helper
                                    (JSON.Get ("contents"), Context));

langkit/support/langkit_support-generic_api-unparsing.ads

@@ -169,6 +169,10 @@ package Langkit_Support.Generic_API.Unparsing is
    --
    --        {"kind": "markAsRoot", "contents": <sub-template>}
    --
+   --    * The "innerRoot" template yields a "innerRoot" Prettier document::
+   --
+   --        {"kind": "innerRoot", "contents": <sub-template>}
+   --
    --    * The "recurse_field" template is valid only in "node" templates for
    --      concrete nodes that are neither abstract, token nor list nodes. When
    --      used, the whole template cannot contain any

langkit/support/langkit_support-prettier_utils.adb

@@ -775,6 +775,8 @@ package body Langkit_Support.Prettier_Utils is
                      Put_Line ("dedentToRoot");
                   when Prettier.Root =>
                      Put_Line ("markAsRoot");
+                  when Prettier.Inner_Root =>
+                     Put_Line ("innerRoot");
                   when Prettier.None =>
                      Put_Line ("none");
                end case;

testsuite/tests/ada_api/unparsing/cmd_innerroot.json

@@ -0,0 +1,7 @@
+{
+  "node_configs": {
+    "VarDecl": {
+      "node": {"kind": "innerRoot", "contents": ["line", "recurse"]}
+    }
+  }
+}

testsuite/tests/ada_api/unparsing/commands.adb

@@ -106,6 +106,7 @@ begin
    Check ("cmd_list.json");
    Check ("cmd_literalline.json");
    Check ("cmd_markasroot.json");
+   Check ("cmd_innerroot.json");
    Check ("cmd_recurse.json");
    Check
      ("cmd_recurse_field.json",

testsuite/tests/ada_api/unparsing/invalid_config.adb

@@ -76,6 +76,7 @@ begin
    Check ("invalid_ifbreak.json");
    Check ("invalid_indent.json");
    Check ("invalid_markasroot.json");
+   Check ("invalid_innerroot.json");
    Check ("invalid_recurse_field.json");
    Check ("invalid_recurse_field2.json");
    Check ("invalid_recurse_field3.json");

testsuite/tests/ada_api/unparsing/invalid_innerroot.json

@@ -0,0 +1,9 @@
+{
+  "node_configs": {
+    "VarDecl": {
+      "fields": {
+        "f_name": {"kind": "innerRoot"}
+      }
+    }
+  }
+}

testsuite/tests/ada_api/unparsing/test.out

@@ -62,6 +62,8 @@ a: Int=2
     template for VarDecl.f_name: missing "contents" key for indent
 # invalid_markasroot.json
     template for VarDecl.f_name: missing "contents" key for markAsRoot
+# invalid_innerroot.json
+    template for VarDecl.f_name: missing "contents" key for innerRoot
 # invalid_recurse_field.json
     template for VarDecl.f_name: "recurse_field" is valid in "node" templates only
 # invalid_recurse_field2.json
@@ -586,6 +588,36 @@ Done.
   }
 }
 
+== cmd_innerroot.json ==
+
+{
+  "kind": "command",
+  "command": {
+    "command": "align",
+    "alignData": {
+      "kind": "innerRoot"
+    },
+    "alignContents": {
+      "kind": "list",
+      "list": [
+        {
+          "kind": "command",
+          "command": {
+            "command": "line",
+            "literal": false,
+            "soft": false,
+            "hard": false
+          }
+        },
+        {
+          "kind": "text",
+          "text": "var i:Int=0;"
+        }
+      ]
+    }
+  }
+}
+
 == cmd_recurse.json ==
 
 {