Merge branch 'issue_756' into 'master'

Unparsing: add a "hardlineWithoutBreakParent" command

Closes #756

See merge request eng/libadalang/langkit!1001

Author: joaopsazevedo

langkit/support/langkit_support-generic_api-unparsing.adb

@@ -394,6 +394,8 @@ package body Langkit_Support.Generic_API.Unparsing is
                   return Pool.Create_Break_Parent;
                elsif Value = "hardline" then
                   return Pool.Create_Hard_Line;
+               elsif Value = "hardlineWithoutBreakParent" then
+                  return Pool.Create_Hard_Line_Without_Break_Parent;
                elsif Value = "line" then
                   return Pool.Create_Line;
                elsif Value = "recurse" then
@@ -880,6 +882,9 @@ package body Langkit_Support.Generic_API.Unparsing is
          when Hard_Line =>
             return Pool.Create_Hard_Line;
 
+         when Hard_Line_Without_Break_Parent =>
+            return Pool.Create_Hard_Line_Without_Break_Parent;
+
          when If_Break =>
             return Pool.Create_If_Break
               (Instantiate_Template

langkit/support/langkit_support-generic_api-unparsing.ads

@@ -104,12 +104,13 @@ package Langkit_Support.Generic_API.Unparsing is
    --
    --        "breakParent"
    --
-   --    * The "line"/"hardline"/"softline"/"literalline" templates yield the
-   --      corresponding Prettier documents::
+   --    * The "line"/"hardline"/"hardLineWithoutBreakPararent"/"softline"/
+   --      "literalline" templates yield the corresponding Prettier documents::
    --
    --        "line"
-   --        "hardlist"
-   --        "softlist"
+   --        "hardline"
+   --        "hardlineWithoutBreakParent"
+   --        "softline"
    --        "literalline"
    --
    --    * The "trim" template yields a "trim" Prettier Document::

langkit/support/langkit_support-prettier_utils.adb

@@ -64,6 +64,9 @@ package body Langkit_Support.Prettier_Utils is
             when Hard_Line =>
                return 0;
 
+            when Hard_Line_Without_Break_Parent =>
+               return 0;
+
             when If_Break =>
                declare
                   Count_Break : constant Natural :=
@@ -157,6 +160,9 @@ package body Langkit_Support.Prettier_Utils is
          when Hard_Line =>
             return Hard_Line;
 
+         when Hard_Line_Without_Break_Parent =>
+            return Hard_Line_Without_Break_Parent;
+
          when If_Break =>
             return If_Break
               (To_Prettier_Document (Document.If_Break_Contents),
@@ -351,6 +357,21 @@ package body Langkit_Support.Prettier_Utils is
       end return;
    end Create_Hard_Line;
 
+   -------------------------------------------
+   -- Create_Hard_Line_Without_Break_Parent --
+   -------------------------------------------
+
+   function Create_Hard_Line_Without_Break_Parent
+     (Self : in out Document_Pool) return Document_Type
+   is
+   begin
+      return Result : constant Document_Type :=
+        new Document_Record (Kind => Hard_Line_Without_Break_Parent)
+      do
+         Self.Register (Result);
+      end return;
+   end Create_Hard_Line_Without_Break_Parent;
+
    ---------------------
    -- Create_If_Break --
    ---------------------
@@ -655,6 +676,9 @@ package body Langkit_Support.Prettier_Utils is
             when Hard_Line =>
                Extend_Spacing (Last_Spacing, Newline);
 
+            when Hard_Line_Without_Break_Parent =>
+               Extend_Spacing (Last_Spacing, Newline);
+
             when If_Break =>
                declare
                   LT_Break : Token_Kind_Ref := Last_Token;
@@ -837,6 +861,9 @@ package body Langkit_Support.Prettier_Utils is
             when Hard_Line =>
                Put_Line ("hardline");
 
+            when Hard_Line_Without_Break_Parent =>
+               Put_Line ("hardlineWithoutBreakParent");
+
             when If_Break =>
                Put_Line ("ifBreak:");
                if Document.If_Break_Group_Id /= No_Symbol then

langkit/support/langkit_support-prettier_utils.ads

@@ -57,6 +57,7 @@ private package Langkit_Support.Prettier_Utils is
       Fill,
       Group,
       Hard_Line,
+      Hard_Line_Without_Break_Parent,
       If_Break,
       Indent,
       Line,
@@ -92,6 +93,9 @@ private package Langkit_Support.Prettier_Utils is
          when Hard_Line =>
             null;
 
+         when Hard_Line_Without_Break_Parent =>
+            null;
+
          when If_Break =>
             If_Break_Contents      : Document_Type;
             If_Break_Flat_Contents : Document_Type;
@@ -183,6 +187,10 @@ private package Langkit_Support.Prettier_Utils is
      (Self : in out Document_Pool) return Document_Type;
    --  Return a ``Hard_Line`` node
 
+   function Create_Hard_Line_Without_Break_Parent
+     (Self : in out Document_Pool) return Document_Type;
+   --  Return a ``Hard_Line_Without_Break_Parent`` node
+
    function Create_If_Break
      (Self          : in out Document_Pool;
       Contents      : Document_Type;

testsuite/tests/ada_api/unparsing/cmd_hardlinewithoutbreakparent.json

@@ -0,0 +1,10 @@
+{
+  "node_configs": {
+    "VarDecl": {
+      "node": [
+        "hardlineWithoutBreakParent",
+        "recurse"
+      ]
+    }
+  }
+}

testsuite/tests/ada_api/unparsing/commands.adb

@@ -99,6 +99,7 @@ begin
    Check ("cmd_fill.json");
    Check ("cmd_group.json");
    Check ("cmd_hardline.json");
+   Check ("cmd_hardlinewithoutbreakparent.json");
    Check ("cmd_ifbreak.json");
    Check ("cmd_indent.json");
    Check ("cmd_line.json");

testsuite/tests/ada_api/unparsing/test.out

@@ -323,6 +323,27 @@ Done.
   ]
 }
 
+== cmd_hardlinewithoutbreakparent.json ==
+
+{
+  "kind": "list",
+  "list": [
+    {
+      "kind": "command",
+      "command": {
+        "command": "line",
+        "literal": false,
+        "soft": false,
+        "hard": true
+      }
+    },
+    {
+      "kind": "text",
+      "text": "var i:Int=0;"
+    }
+  ]
+}
+
 == cmd_ifbreak.json ==
 
 {