Merge branch 'gnatformat-issue_50' into 'master'

Unparsing: Try to fit f_subp_spec, f_aspects and is on the same line

Closes eng/ide/gnatformat#50

See merge request eng/libadalang/libadalang!1714

extensions/default_unparsing_config.json

@@ -5077,17 +5077,22 @@
             "field": "f_overriding"
           },
           {
-            "kind": "recurse_field",
-            "field": "f_subp_spec"
-          },
-          {
-            "kind": "recurse_field",
-            "field": "f_aspects"
-          },
-          "hardlineWithoutBreakParent",
-          {
-            "kind": "text",
-            "text": "is"
+            "kind": "group",
+            "document": [
+              {
+                "kind": "recurse_field",
+                "field": "f_subp_spec"
+              },
+              {
+                "kind": "recurse_field",
+                "field": "f_aspects"
+              },
+              "line",
+              {
+                "kind": "text",
+                "text": "is"
+              }
+            ]
           },
           {
             "kind": "recurse_field",
@@ -5101,7 +5106,7 @@
             "kind": "recurse_field",
             "field": "f_stmts"
           },
-          "hardlineWithoutBreakParent",
+          "hardline",
           {
             "kind": "text",
             "text": "end"
@@ -5118,7 +5123,7 @@
       },
       "fields": {
         "f_aspects": [
-          "hardline",
+          "line",
           "recurse"
         ],
         "f_decls": [

testsuite/tests/unparsing/decl_block/test.out

@@ -1,5 +1,4 @@
-procedure Foo
-is
+procedure Foo is
 begin
    declare
       Bar : Baz;

testsuite/tests/unparsing/exception_handler/test.out

@@ -1,5 +1,4 @@
-procedure Foo
-is
+procedure Foo is
 begin
    declare
       Bar : Baz;

testsuite/tests/unparsing/object_decl/table/test.out

@@ -1,5 +1,4 @@
-procedure Main
-is
+procedure Main is
    AAAAAAAAAAAAAAAA             : Baaaaaar             := Bar;
    BBBBBBBBBBBBBBBBBBBB         :
      Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz       :=

testsuite/tests/unparsing/protected_body/simple_body/test.out

@@ -1,12 +1,10 @@
 protected body Shared_Array is
-   function Component (N : in Index) return Item
-   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
+   procedure Set_Component (N : in Index; E : in Item) is
    begin
       Table (N) := E;
    end Set_Component;

testsuite/tests/unparsing/protected_body/with_entry/test.out

@@ -5,8 +5,7 @@ protected body Resource is
       Busy := True;
    end Seize;
 
-   procedure Release
-   is
+   procedure Release is
    begin
       Busy := False;
    end Release;

testsuite/tests/unparsing/subp_body/long_subp_spec/input.ada

@@ -0,0 +1,3 @@
+function Foo (A : Bar; B : Baz; C : Qux; D : Corge) return Freeeeeeeeeeeeeeed is begin
+   null;
+end;

testsuite/tests/unparsing/subp_body/long_subp_spec/test.out

@@ -0,0 +1,5 @@
+function Foo (A : Bar; B : Baz; C : Qux; D : Corge) return Freeeeeeeeeeeeeeed
+is
+begin
+   null;
+end;

testsuite/tests/unparsing/subp_body/long_subp_spec/test.yaml

@@ -0,0 +1,5 @@
+driver: unparser
+rule: subp_body
+description: |
+  Test a `SubpBody` whose `f_subp_spec` and `is` token do not fit on one
+  line.

testsuite/tests/unparsing/subp_body/long_subp_spec_with_short_aspect/input.ada

@@ -0,0 +1,5 @@
+function Fooooooooooooo
+  (A : Bar; B : Baz; C : Qux) return Freeeeeeeeeeeeeeeeeed with Precondition is
+begin
+   null;
+end;

testsuite/tests/unparsing/subp_body/long_subp_spec_with_short_aspect/test.out

@@ -0,0 +1,7 @@
+function Fooooooooooooo
+  (A : Bar; B : Baz; C : Qux) return Freeeeeeeeeeeeeeeeeed
+with Precondition
+is
+begin
+   null;
+end;

testsuite/tests/unparsing/subp_body/long_subp_spec_with_short_aspect/test.yaml

@@ -0,0 +1,5 @@
+driver: unparser
+rule: subp_body
+description: |
+  Test that, if the `f_subp_spec` of a `SubpBody` breaks, then a line break is
+  added before `f_aspects` and the `is` token.

testsuite/tests/unparsing/subp_body/no_end_name/test.out

@@ -1,5 +1,4 @@
-function Foo (A : Bar; B : Baz; C : Qux; D : Corge) return Fred
-is
+function Foo (A : Bar; B : Baz; C : Qux; D : Corge) return Fred is
    type Garply;
 begin
    null;

testsuite/tests/unparsing/subp_body/with_decls/test.out

@@ -1,5 +1,4 @@
-function Foo (A : Bar; B : Baz; C : Qux; D : Corge) return Fred
-is
+function Foo (A : Bar; B : Baz; C : Qux; D : Corge) return Fred is
    type Garply;
 begin
    null;

testsuite/tests/unparsing/subp_body/with_long_aspect/input.ada

@@ -0,0 +1,8 @@
+function Foo (A : Bar; B : Baz; C : Qux; D : Corge) return Fred
+with Pre => Some_Long_Precondition (With_An_Aggregate => And_Looooooooooooong_R_Expr)
+is
+   type My_Type;
+begin
+   null;
+end;
+

testsuite/tests/unparsing/subp_body/with_long_aspect/test.out

@@ -0,0 +1,9 @@
+function Foo (A : Bar; B : Baz; C : Qux; D : Corge) return Fred
+with
+  Pre =>
+    Some_Long_Precondition (With_An_Aggregate => And_Looooooooooooong_R_Expr)
+is
+   type My_Type;
+begin
+   null;
+end;

testsuite/tests/unparsing/subp_body/with_long_aspect/test.yaml

@@ -0,0 +1,5 @@
+driver: unparser
+rule: subp_body
+description: |
+  Test that when a `SubpBody` has an non null `f_aspects`, a line break is
+  added before the `is` token.

testsuite/tests/unparsing/subp_body/with_short_aspect/input.ada

@@ -0,0 +1,5 @@
+function Foo (A : Bar) return Fred with Pre => Precondition is
+   type My_Type;
+begin
+   null;
+end;

testsuite/tests/unparsing/subp_body/with_short_aspect/test.out

@@ -0,0 +1,5 @@
+function Foo (A : Bar) return Fred with Pre => Precondition is
+   type My_Type;
+begin
+   null;
+end;

testsuite/tests/unparsing/subp_body/with_short_aspect/test.yaml

@@ -0,0 +1,5 @@
+driver: unparser
+rule: subp_body
+description: |
+  Test a `SubpBody` whose `f_subp_spec` and `is` token do not fine on one
+  line.

testsuite/tests/unparsing/subp_body/without_decls/test.out

@@ -1,5 +1,4 @@
-function Foo (A : Bar; B : Baz; C : Qux; D : Corge) return Fred
-is
+function Foo (A : Bar; B : Baz; C : Qux; D : Corge) return Fred is
 begin
    null;
 end Foo;

testsuite/tests/unparsing/subunit/test.out

@@ -1,6 +1,5 @@
 separate(Parent)
-procedure Inner
-is
+procedure Inner is
 begin
    Foo;
 end Inner;