Merge branch 'gnatformat-issue_52' into 'master'

Unparsing: Fix ConcreteTypeDecl, ProtectedTypeDecl and TaskTypeDecl Closes eng/ide/gnatformat#52 See merge request eng/libadalang/libadalang!1717
AdaCore · Jul 31, 2024 · c6e8e13 · c6e8e13
2 parents 1ca4518 + 4ffa3bd
commit c6e8e13
Show file tree

Hide file tree

Showing 212 changed files with 696 additions and 460 deletions.
diff --git a/extensions/default_unparsing_config.json b/extensions/default_unparsing_config.json
diff --git a/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_element_type/test.out b/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_element_type/test.out
@@ -1,2 +1,2 @@
 array (Buffer_Index)
-  of Veeeeeeeeeeeeeeery_Looooooooooooonnnnnnnnnnnng_Element_Type
+of Veeeeeeeeeeeeeeery_Looooooooooooonnnnnnnnnnnng_Element_Type
diff --git a/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_element_type/test.yaml b/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_element_type/test.yaml
@@ -1,7 +1,7 @@
 description: |
     This test checks the formatting of an anonymous array type declaration.
     It is expected the declaration breaks before `of` keywords and the new
-    line be indented.
- 
+    line to have the same indentation as the `array` keyword.
+
 driver: unparser
 rule: anonymous_type_decl
diff --git a/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_index/test.out b/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_index/test.out
@@ -1,2 +1,2 @@
 array (Veeeeeeeerrrrrrry_Loooooooooooooooooooooooooooooong_Buffer_Indexxxxxxxx)
-  of Character
+of Character
diff --git a/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_index/test.yaml b/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_index/test.yaml
@@ -2,6 +2,6 @@ description: |
     This test checks the formatting of an anonymous array type declaration.
     It is expected the declaration breaks before `of` keywords and the new
     line be indented.
- 
+
 driver: unparser
 rule: anonymous_type_decl
diff --git a/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_indices/input.ada b/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_indices/input.ada
@@ -0,0 +1 @@
+array (Buffer_Index_1, Buffer_Index_2, Buffer_Index_3, Buffer_Index_4, Buffer_Index_5) of Character.Long_Dotted_Name.Long_Dotted_Name.Long_Dotted_Name.Long_Dotted_Name
diff --git a/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_indices/test.out b/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_indices/test.out
@@ -0,0 +1,10 @@
+array (Buffer_Index_1,
+       Buffer_Index_2,
+       Buffer_Index_3,
+       Buffer_Index_4,
+       Buffer_Index_5)
+of Character
+     .Long_Dotted_Name
+     .Long_Dotted_Name
+     .Long_Dotted_Name
+     .Long_Dotted_Name
diff --git a/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_indices/test.yaml b/testsuite/tests/unparsing/anonymous_type_decl/array_type/long_indices/test.yaml
@@ -0,0 +1,10 @@
+description: |
+    This test checks the formatting of an anonymous array type declaration with
+    multiple indices.
+    It is expected the declaration breaks before `of` keywords and the new
+    line to have the same indentation as the `array` keyword.
+    Is is also expected that the indices have continuation line indentation
+    relative to where the `array` keyword ends.
+
+driver: unparser
+rule: anonymous_type_decl
diff --git a/testsuite/tests/unparsing/anonymous_type_decl/array_type/simple_decl/test.yaml b/testsuite/tests/unparsing/anonymous_type_decl/array_type/simple_decl/test.yaml
@@ -1,6 +1,6 @@
 description: |
     This test checks the formatting of an anonymous array type declaration.
     It is expected the declaration stays on a single line.
- 
+
 driver: unparser
 rule: anonymous_type_decl
diff --git a/testsuite/tests/unparsing/derived_type_def/derived_with_interface/test.out b/testsuite/tests/unparsing/derived_type_def/derived_with_interface/test.out
diff --git a/...ests/unparsing/derived_type_def/derived_with_interface_list_and_record_extension/test.out b/...ests/unparsing/derived_type_def/derived_with_interface_list_and_record_extension/test.out
diff --git a/testsuite/tests/unparsing/derived_type_def/derived_with_record_extension/test.out b/testsuite/tests/unparsing/derived_type_def/derived_with_record_extension/test.out
diff --git a/testsuite/tests/unparsing/interface_type_def/base_type/test.out b/testsuite/tests/unparsing/interface_type_def/base_type/test.out
diff --git a/testsuite/tests/unparsing/interface_type_def/synchro_and_interface_list/test.out b/testsuite/tests/unparsing/interface_type_def/synchro_and_interface_list/test.out
diff --git a/testsuite/tests/unparsing/protected_type_decl/with_aspects/test.out b/testsuite/tests/unparsing/protected_type_decl/with_aspects/test.out
@@ -1,5 +1,6 @@
 protected type Worker
-  (Priority_Level : System.Priority; Buffer_Parameter : access Buffer)
+  (Priority_Level   : System.Priority;
+   Buffer_Parameter : access Buffer)
   with Priority => Prio
 is
    entry Fill;

diff --git a/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/test.out b/testsuite/tests/unparsing/protected_type_decl/with_known_discriminant/test.out
@@ -1,6 +1,6 @@
 protected type Buffer
   (Nb_Elements_In_Buffer : Integer := 100;
-   Need_To_Activate_All : Boolean := False)
+   Need_To_Activate_All  : Boolean := False)
 is
    procedure Activate;
    procedure Release;

diff --git a/testsuite/tests/unparsing/record_type_def/record_mixed_with_variant/test.out b/testsuite/tests/unparsing/record_type_def/record_mixed_with_variant/test.out
diff --git a/testsuite/tests/unparsing/record_type_def/record_with_component_default_expr/test.out b/testsuite/tests/unparsing/record_type_def/record_with_component_default_expr/test.out
diff --git a/testsuite/tests/unparsing/record_type_def/record_with_discriminants/test.out b/testsuite/tests/unparsing/record_type_def/record_with_discriminants/test.out
diff --git a/testsuite/tests/unparsing/record_type_def/record_with_discriminants_null_component/test.out b/testsuite/tests/unparsing/record_type_def/record_with_discriminants_null_component/test.out
diff --git a/testsuite/tests/unparsing/record_type_def/record_with_long_discriminants/input.ada b/testsuite/tests/unparsing/record_type_def/record_with_long_discriminants/input.ada
diff --git a/testsuite/tests/unparsing/record_type_def/record_with_long_discriminants/test.out b/testsuite/tests/unparsing/record_type_def/record_with_long_discriminants/test.out
diff --git a/testsuite/tests/unparsing/record_type_def/record_with_variant/input.ada b/testsuite/tests/unparsing/record_type_def/record_with_variant/input.ada
diff --git a/testsuite/tests/unparsing/record_type_def/record_with_variant/test.out b/testsuite/tests/unparsing/record_type_def/record_with_variant/test.out
diff --git a/testsuite/tests/unparsing/record_type_def/simple_record/test.out b/testsuite/tests/unparsing/record_type_def/simple_record/test.out
diff --git a/testsuite/tests/unparsing/signed_int_type_def/long_range/input.ada b/testsuite/tests/unparsing/signed_int_type_def/long_range/input.ada
diff --git a/testsuite/tests/unparsing/task_type_decl/simple_task_type/test.out b/testsuite/tests/unparsing/task_type_decl/simple_task_type/test.out
@@ -1,5 +1,4 @@
-task type Server
-is
+task type Server is
    entry Next_Work_Item (WI : in Work_Item);
    entry Shut_Down;
 end Server;
diff --git a/testsuite/tests/unparsing/task_type_decl/with_aspects/input.ada b/testsuite/tests/unparsing/task_type_decl/with_aspects/input.ada
@@ -0,0 +1,5 @@
+task type Worker(Priority_Level : System.Priority; Buffer_Parameter : access Buffer)
+   with Priority => Prio is
+   entry Fill;
+   entry Drain;
+end Worker;
diff --git a/testsuite/tests/unparsing/task_type_decl/with_aspects/test.out b/testsuite/tests/unparsing/task_type_decl/with_aspects/test.out
@@ -0,0 +1,8 @@
+task type Worker
+  (Priority_Level   : System.Priority;
+   Buffer_Parameter : access Buffer)
+  with Priority => Prio
+is
+   entry Fill;
+   entry Drain;
+end Worker;
diff --git a/testsuite/tests/unparsing/task_type_decl/with_aspects/test.yaml b/testsuite/tests/unparsing/task_type_decl/with_aspects/test.yaml
@@ -0,0 +1,11 @@
+description: |
+    This test checks the formatting of a protected type declaration
+    with known discriminant, aspects and public.
+    It is expected the declaration breaks before the discriminant
+    specification, before `with` and `is` keywords and be formatted
+    by indenting the discriminant specification, the aspects and the
+    public part content and keeping the `protected`, `is` and `end`
+    keywords aligned.
+
+driver: unparser
+rule: task_type_decl
diff --git a/testsuite/tests/unparsing/task_type_decl/with_known_discriminant/input.ada b/testsuite/tests/unparsing/task_type_decl/with_known_discriminant/input.ada
@@ -1,5 +1,4 @@
-task type Keyboard_Driver(ID : Keyboard_ID := New_ID) is
-      new Serial_Device with
+task type Keyboard_Driver (ID : Keyboard_ID := New_ID) is new Serial_Device with
    entry Read (C : out Character);
    entry Write(C : in  Character);
 end Keyboard_Driver;
diff --git a/testsuite/tests/unparsing/task_type_decl/with_known_discriminant/test.out b/testsuite/tests/unparsing/task_type_decl/with_known_discriminant/test.out
@@ -1,6 +1,5 @@
-task type Keyboard_Driver (ID : Keyboard_ID := New_ID)
-is new
-   Serial_Device
+task type Keyboard_Driver (ID : Keyboard_ID := New_ID) is
+  new Serial_Device
 with
    entry Read (C : out Character);
    entry Write (C : in Character);

diff --git a/testsuite/tests/unparsing/type_def/access_to_subp_def/input.ada b/testsuite/tests/unparsing/type_def/access_to_subp_def/input.ada
@@ -0,0 +1,3 @@
+procedure Find_Matching_Parents
+  (Match_1 : access protected function (Node : Libadalang.Analysis.Ada_Node'Class) return Boolean;
+   Match_2 : not null access protected function (Node : Libadalang.Analysis.Ada_Node'Class) return Boolean);
diff --git a/testsuite/tests/unparsing/type_def/access_to_subp_def/test.out b/testsuite/tests/unparsing/type_def/access_to_subp_def/test.out
@@ -0,0 +1,7 @@
+procedure Find_Matching_Parents
+  (Match_1 :
+     access protected function
+       (Node : Libadalang.Analysis.Ada_Node'Class) return Boolean;
+   Match_2 :
+     not null access protected function
+       (Node : Libadalang.Analysis.Ada_Node'Class) return Boolean);
diff --git a/testsuite/tests/unparsing/type_def/access_to_subp_def/test.yaml b/testsuite/tests/unparsing/type_def/access_to_subp_def/test.yaml
@@ -0,0 +1,6 @@
+driver: unparser
+rule: subp_decl
+description: |
+  Test that `f_has_not_null`, `f_has_protected` and `f_subp_spec` do not have
+  line breaks between them. Also test that `f_subp_spec` has its parameters
+  correctly indented.
diff --git a/..._array/constraint_list_as_range/input.ada → ..._array/constraint_list_as_range/input.ada b/..._array/constraint_list_as_range/input.ada → ..._array/constraint_list_as_range/input.ada
diff --git a/...d_array/constraint_list_as_range/test.out → ...d_array/constraint_list_as_range/test.out b/...d_array/constraint_list_as_range/test.out → ...d_array/constraint_list_as_range/test.out
diff --git a/..._array/constraint_list_as_range/test.yaml → ..._array/constraint_list_as_range/test.yaml b/..._array/constraint_list_as_range/test.yaml → ..._array/constraint_list_as_range/test.yaml
diff --git a/...aint_list_as_subtype_indication/input.ada → ...aint_list_as_subtype_indication/input.ada b/...aint_list_as_subtype_indication/input.ada → ...aint_list_as_subtype_indication/input.ada
diff --git a/...raint_list_as_subtype_indication/test.out → ...raint_list_as_subtype_indication/test.out b/...raint_list_as_subtype_indication/test.out → ...raint_list_as_subtype_indication/test.out
diff --git a/...aint_list_as_subtype_indication/test.yaml → ...aint_list_as_subtype_indication/test.yaml b/...aint_list_as_subtype_indication/test.yaml → ...aint_list_as_subtype_indication/test.yaml
diff --git a/...ained_array/long_component_type/input.ada → ...ained_array/long_component_type/input.ada b/...ained_array/long_component_type/input.ada → ...ained_array/long_component_type/input.ada
diff --git a/...rained_array/long_component_type/test.out → ...rained_array/long_component_type/test.out b/...rained_array/long_component_type/test.out → ...rained_array/long_component_type/test.out
diff --git a/...ained_array/long_component_type/test.yaml → ...ained_array/long_component_type/test.yaml b/...ained_array/long_component_type/test.yaml → ...ained_array/long_component_type/test.yaml
diff --git a/...ined_array/long_constraint_list/input.ada → ...ined_array/long_constraint_list/input.ada b/...ined_array/long_constraint_list/input.ada → ...ined_array/long_constraint_list/input.ada
diff --git a/...ained_array/long_constraint_list/test.out → ...ained_array/long_constraint_list/test.out b/...ained_array/long_constraint_list/test.out → ...ained_array/long_constraint_list/test.out
diff --git a/...ined_array/long_constraint_list/test.yaml → ...ined_array/long_constraint_list/test.yaml b/...ined_array/long_constraint_list/test.yaml → ...ined_array/long_constraint_list/test.yaml
diff --git a/...onstrained_array/long_type_name/input.ada → ...onstrained_array/long_type_name/input.ada b/...onstrained_array/long_type_name/input.ada → ...onstrained_array/long_type_name/input.ada
diff --git a/...constrained_array/long_type_name/test.out → ...constrained_array/long_type_name/test.out b/...constrained_array/long_type_name/test.out → ...constrained_array/long_type_name/test.out
diff --git a/...onstrained_array/long_type_name/test.yaml → ...onstrained_array/long_type_name/test.yaml b/...onstrained_array/long_type_name/test.yaml → ...onstrained_array/long_type_name/test.yaml
diff --git a/...ray/multidimensional_constraint/input.ada → ...ray/multidimensional_constraint/input.ada b/...ray/multidimensional_constraint/input.ada → ...ray/multidimensional_constraint/input.ada
diff --git a/...rray/multidimensional_constraint/test.out → ...rray/multidimensional_constraint/test.out b/...rray/multidimensional_constraint/test.out → ...rray/multidimensional_constraint/test.out
diff --git a/...ray/multidimensional_constraint/test.yaml → ...ray/multidimensional_constraint/test.yaml b/...ray/multidimensional_constraint/test.yaml → ...ray/multidimensional_constraint/test.yaml
diff --git a/...ultidimensional_long_constraint/input.ada → ...ultidimensional_long_constraint/input.ada b/...ultidimensional_long_constraint/input.ada → ...ultidimensional_long_constraint/input.ada
diff --git a/...multidimensional_long_constraint/test.out → ...multidimensional_long_constraint/test.out b/...multidimensional_long_constraint/test.out → ...multidimensional_long_constraint/test.out
diff --git a/...ultidimensional_long_constraint/test.yaml → ...ultidimensional_long_constraint/test.yaml b/...ultidimensional_long_constraint/test.yaml → ...ultidimensional_long_constraint/test.yaml
diff --git a/...trained_array/simple_constraint/input.ada → ...trained_array/simple_constraint/input.ada b/...trained_array/simple_constraint/input.ada → ...trained_array/simple_constraint/input.ada
diff --git a/...strained_array/simple_constraint/test.out → ...strained_array/simple_constraint/test.out b/...strained_array/simple_constraint/test.out → ...strained_array/simple_constraint/test.out
diff --git a/...trained_array/simple_constraint/test.yaml → ...trained_array/simple_constraint/test.yaml b/...trained_array/simple_constraint/test.yaml → ...trained_array/simple_constraint/test.yaml
diff --git a/...array/very_long_constraint_list/input.ada → ...array/very_long_constraint_list/input.ada b/...array/very_long_constraint_list/input.ada → ...array/very_long_constraint_list/input.ada
diff --git a/..._array/very_long_constraint_list/test.out → ..._array/very_long_constraint_list/test.out b/..._array/very_long_constraint_list/test.out → ..._array/very_long_constraint_list/test.out
diff --git a/...array/very_long_constraint_list/test.yaml → ...array/very_long_constraint_list/test.yaml b/...array/very_long_constraint_list/test.yaml → ...array/very_long_constraint_list/test.yaml
diff --git a/...ray/multidimensional_constraint/input.ada → ...ray/multidimensional_constraint/input.ada b/...ray/multidimensional_constraint/input.ada → ...ray/multidimensional_constraint/input.ada
diff --git a/...rray/multidimensional_constraint/test.out → ...rray/multidimensional_constraint/test.out b/...rray/multidimensional_constraint/test.out → ...rray/multidimensional_constraint/test.out
diff --git a/...ray/multidimensional_constraint/test.yaml → ...ray/multidimensional_constraint/test.yaml b/...ray/multidimensional_constraint/test.yaml → ...ray/multidimensional_constraint/test.yaml
diff --git a/...ultidimensional_long_constraint/input.ada → ...ultidimensional_long_constraint/input.ada b/...ultidimensional_long_constraint/input.ada → ...ultidimensional_long_constraint/input.ada
diff --git a/...multidimensional_long_constraint/test.out → ...multidimensional_long_constraint/test.out b/...multidimensional_long_constraint/test.out → ...multidimensional_long_constraint/test.out
diff --git a/...ultidimensional_long_constraint/test.yaml → ...ultidimensional_long_constraint/test.yaml b/...ultidimensional_long_constraint/test.yaml → ...ultidimensional_long_constraint/test.yaml
diff --git a/...trained_array/simple_constraint/input.ada → ...trained_array/simple_constraint/input.ada b/...trained_array/simple_constraint/input.ada → ...trained_array/simple_constraint/input.ada
diff --git a/...strained_array/simple_constraint/test.out → ...strained_array/simple_constraint/test.out b/...strained_array/simple_constraint/test.out → ...strained_array/simple_constraint/test.out
diff --git a/...trained_array/simple_constraint/test.yaml → ...trained_array/simple_constraint/test.yaml b/...trained_array/simple_constraint/test.yaml → ...trained_array/simple_constraint/test.yaml
diff --git a/...d_type_def/derived_integer_type/input.ada → ...d_type_def/derived_integer_type/input.ada b/...d_type_def/derived_integer_type/input.ada → ...d_type_def/derived_integer_type/input.ada
diff --git a/...ed_type_def/derived_integer_type/test.out → ...ed_type_def/derived_integer_type/test.out b/...ed_type_def/derived_integer_type/test.out → ...ed_type_def/derived_integer_type/test.out
diff --git a/...d_type_def/derived_integer_type/test.yaml → ...d_type_def/derived_integer_type/test.yaml b/...d_type_def/derived_integer_type/test.yaml → ...d_type_def/derived_integer_type/test.yaml
diff --git a/..._type_def/derived_with_abstract/input.ada → ..._type_def/derived_with_abstract/input.ada b/..._type_def/derived_with_abstract/input.ada → ..._type_def/derived_with_abstract/input.ada
diff --git a/...d_type_def/derived_with_abstract/test.out → ...d_type_def/derived_with_abstract/test.out b/...d_type_def/derived_with_abstract/test.out → ...d_type_def/derived_with_abstract/test.out
diff --git a/..._type_def/derived_with_abstract/test.yaml → ..._type_def/derived_with_abstract/test.yaml b/..._type_def/derived_with_abstract/test.yaml → ..._type_def/derived_with_abstract/test.yaml
diff --git a/...type_def/derived_with_interface/input.ada → ...type_def/derived_with_interface/input.ada b/...type_def/derived_with_interface/input.ada → ...type_def/derived_with_interface/input.ada
diff --git a/testsuite/tests/unparsing/type_def/derived_type_def/derived_with_interface/test.out b/testsuite/tests/unparsing/type_def/derived_type_def/derived_with_interface/test.out
@@ -0,0 +1 @@
+type Derived_Interface is new Int1 and Int2 with null record;
diff --git a/...type_def/derived_with_interface/test.yaml → ...type_def/derived_with_interface/test.yaml b/...type_def/derived_with_interface/test.yaml → ...type_def/derived_with_interface/test.yaml
diff --git a/...d_type_def/derived_with_limited/input.ada → ...d_type_def/derived_with_limited/input.ada b/...d_type_def/derived_with_limited/input.ada → ...d_type_def/derived_with_limited/input.ada
diff --git a/...ed_type_def/derived_with_limited/test.out → ...ed_type_def/derived_with_limited/test.out b/...ed_type_def/derived_with_limited/test.out → ...ed_type_def/derived_with_limited/test.out
diff --git a/...d_type_def/derived_with_limited/test.yaml → ...d_type_def/derived_with_limited/test.yaml b/...d_type_def/derived_with_limited/test.yaml → ...d_type_def/derived_with_limited/test.yaml
diff --git a/...d_type_def/derived_with_private/input.ada → ...d_type_def/derived_with_private/input.ada b/...d_type_def/derived_with_private/input.ada → ...d_type_def/derived_with_private/input.ada
diff --git a/...ed_type_def/derived_with_private/test.out → ...ed_type_def/derived_with_private/test.out b/...ed_type_def/derived_with_private/test.out → ...ed_type_def/derived_with_private/test.out
diff --git a/...d_type_def/derived_with_private/test.yaml → ...d_type_def/derived_with_private/test.yaml b/...d_type_def/derived_with_private/test.yaml → ...d_type_def/derived_with_private/test.yaml
diff --git a/...f/derived_with_record_extension/input.ada → ...f/derived_with_record_extension/input.ada b/...f/derived_with_record_extension/input.ada → ...f/derived_with_record_extension/input.ada
diff --git a/testsuite/tests/unparsing/type_def/derived_type_def/derived_with_record_extension/test.out b/testsuite/tests/unparsing/type_def/derived_type_def/derived_with_record_extension/test.out
@@ -0,0 +1,3 @@
+type Painted_Point is new Poooooooooooooiiiiiiiiiint1 with record
+   Paint : Color := White;
+end record;
diff --git a/...f/derived_with_record_extension/test.yaml → ...f/derived_with_record_extension/test.yaml b/...f/derived_with_record_extension/test.yaml → ...f/derived_with_record_extension/test.yaml
diff --git a/...type_def/derived_type_def/discriminants_and_interface_list_and_record_extension/input.ada b/...type_def/derived_type_def/discriminants_and_interface_list_and_record_extension/input.ada
@@ -0,0 +1,11 @@
+type Painted_Point
+  (Foo : Fooooooooooooooo := Foo_Bar;
+   Baar : Baaaaaaaaaar;
+   Baaaz : Baaaaaaaaaaaaaaz := Baz_Baz)
+is abstract limited new Poooooooooooooiiiiiiiiiint1
+  and Poooooooooooooooooiiiiint2
+  and Point3
+with record
+   Paint_1 : Color := White;
+   Paint_222 : Color_X := White;
+end record;
diff --git a/.../type_def/derived_type_def/discriminants_and_interface_list_and_record_extension/test.out b/.../type_def/derived_type_def/discriminants_and_interface_list_and_record_extension/test.out
@@ -0,0 +1,12 @@
+type Painted_Point
+  (Foo   : Fooooooooooooooo := Foo_Bar;
+   Baar  : Baaaaaaaaaar;
+   Baaaz : Baaaaaaaaaaaaaaz := Baz_Baz)
+is abstract limited
+  new Poooooooooooooiiiiiiiiiint1
+  and Poooooooooooooooooiiiiint2
+  and Point3
+with record
+   Paint_1   : Color   := White;
+   Paint_222 : Color_X := White;
+end record;
diff --git a/...type_def/derived_type_def/discriminants_and_interface_list_and_record_extension/test.yaml b/...type_def/derived_type_def/discriminants_and_interface_list_and_record_extension/test.yaml
@@ -0,0 +1,9 @@
+driver: unparser
+rule: type_decl
+description: |
+    This test checks the formatting of a derived type declaration with
+    non empty interface list, non empty discriminats and record extension.
+    It is expected the declaration breaks after `is abstract limited` and
+    `before `with record`.
+    The interface list be splitted in multiple lines and continuation line
+    indented.
diff --git a/...rface_list_and_record_extension/input.ada → ...rface_list_and_record_extension/input.ada b/...rface_list_and_record_extension/input.ada → ...rface_list_and_record_extension/input.ada
diff --git a/...te/tests/unparsing/type_def/derived_type_def/interface_list_and_record_extension/test.out b/...te/tests/unparsing/type_def/derived_type_def/interface_list_and_record_extension/test.out
@@ -0,0 +1,7 @@
+type Painted_Point is
+  new Poooooooooooooiiiiiiiiiint1
+  and Poooooooooooooooooiiiiint2
+  and Point3
+with record
+   Paint : Color := White;
+end record;
diff --git a/...rface_list_and_record_extension/test.yaml → ...rface_list_and_record_extension/test.yaml b/...rface_list_and_record_extension/test.yaml → ...rface_list_and_record_extension/test.yaml
diff --git a/...ng/derived_type_def/simple_type/input.ada → ...ef/derived_type_def/simple_type/input.ada b/...ng/derived_type_def/simple_type/input.ada → ...ef/derived_type_def/simple_type/input.ada
diff --git a/...ing/derived_type_def/simple_type/test.out → ...def/derived_type_def/simple_type/test.out b/...ing/derived_type_def/simple_type/test.out → ...def/derived_type_def/simple_type/test.out
diff --git a/...ng/derived_type_def/simple_type/test.yaml → ...ef/derived_type_def/simple_type/test.yaml b/...ng/derived_type_def/simple_type/test.yaml → ...ef/derived_type_def/simple_type/test.yaml
diff --git a/testsuite/tests/unparsing/type_def/derived_type_def/with_record_separate_line/input.ada b/testsuite/tests/unparsing/type_def/derived_type_def/with_record_separate_line/input.ada
@@ -0,0 +1 @@
+type Foo is new Bar and Baz and Corge and Garply and Fred and Fnoord with record A : B; end record;
diff --git a/testsuite/tests/unparsing/type_def/derived_type_def/with_record_separate_line/test.out b/testsuite/tests/unparsing/type_def/derived_type_def/with_record_separate_line/test.out
@@ -0,0 +1,4 @@
+type Foo is new Bar and Baz and Corge and Garply and Fred and Fnoord
+with record
+   A : B;
+end record;
diff --git a/testsuite/tests/unparsing/type_def/derived_type_def/with_record_separate_line/test.yaml b/testsuite/tests/unparsing/type_def/derived_type_def/with_record_separate_line/test.yaml
@@ -0,0 +1,6 @@
+description: |
+    This test checks the formatting of a simple derived type declaration.
+    It is expected the declaration stays on a single line.
+
+driver: unparser
+rule: type_decl
diff --git a/...nparsing/enum_type_def/long_def/input.ada → ...type_def/enum_type_def/long_def/input.ada b/...nparsing/enum_type_def/long_def/input.ada → ...type_def/enum_type_def/long_def/input.ada
diff --git a/...unparsing/enum_type_def/long_def/test.out → .../type_def/enum_type_def/long_def/test.out b/...unparsing/enum_type_def/long_def/test.out → .../type_def/enum_type_def/long_def/test.out
diff --git a/...nparsing/enum_type_def/long_def/test.yaml → ...type_def/enum_type_def/long_def/test.yaml b/...nparsing/enum_type_def/long_def/test.yaml → ...type_def/enum_type_def/long_def/test.yaml
diff --git a/...enum_type_def/long_literal_list/input.ada → ...enum_type_def/long_literal_list/input.ada b/...enum_type_def/long_literal_list/input.ada → ...enum_type_def/long_literal_list/input.ada
diff --git a/.../enum_type_def/long_literal_list/test.out → .../enum_type_def/long_literal_list/test.out b/.../enum_type_def/long_literal_list/test.out → .../enum_type_def/long_literal_list/test.out
diff --git a/...enum_type_def/long_literal_list/test.yaml → ...enum_type_def/long_literal_list/test.yaml b/...enum_type_def/long_literal_list/test.yaml → ...enum_type_def/long_literal_list/test.yaml
diff --git a/...ng/enum_type_def/long_type_name/input.ada → ...ef/enum_type_def/long_type_name/input.ada b/...ng/enum_type_def/long_type_name/input.ada → ...ef/enum_type_def/long_type_name/input.ada
diff --git a/...ing/enum_type_def/long_type_name/test.out → ...def/enum_type_def/long_type_name/test.out b/...ing/enum_type_def/long_type_name/test.out → ...def/enum_type_def/long_type_name/test.out
diff --git a/...ng/enum_type_def/long_type_name/test.yaml → ...ef/enum_type_def/long_type_name/test.yaml b/...ng/enum_type_def/long_type_name/test.yaml → ...ef/enum_type_def/long_type_name/test.yaml
diff --git a/...parsing/enum_type_def/short_def/input.ada → ...ype_def/enum_type_def/short_def/input.ada b/...parsing/enum_type_def/short_def/input.ada → ...ype_def/enum_type_def/short_def/input.ada
diff --git a/...nparsing/enum_type_def/short_def/test.out → ...type_def/enum_type_def/short_def/test.out b/...nparsing/enum_type_def/short_def/test.out → ...type_def/enum_type_def/short_def/test.out
diff --git a/...parsing/enum_type_def/short_def/test.yaml → ...ype_def/enum_type_def/short_def/test.yaml b/...parsing/enum_type_def/short_def/test.yaml → ...ype_def/enum_type_def/short_def/test.yaml
diff --git a/...ng/interface_type_def/base_type/input.ada → ...ef/interface_type_def/base_type/input.ada b/...ng/interface_type_def/base_type/input.ada → ...ef/interface_type_def/base_type/input.ada
diff --git a/testsuite/tests/unparsing/type_def/interface_type_def/base_type/test.out b/testsuite/tests/unparsing/type_def/interface_type_def/base_type/test.out
@@ -0,0 +1 @@
+type Base_Type is interface and Interface_1 and Interface_2;
diff --git a/...ng/interface_type_def/base_type/test.yaml → ...ef/interface_type_def/base_type/test.yaml b/...ng/interface_type_def/base_type/test.yaml → ...ef/interface_type_def/base_type/test.yaml
diff --git a/...face_type_def/limited_interface/input.ada → ...face_type_def/limited_interface/input.ada b/...face_type_def/limited_interface/input.ada → ...face_type_def/limited_interface/input.ada
diff --git a/...rface_type_def/limited_interface/test.out → ...rface_type_def/limited_interface/test.out b/...rface_type_def/limited_interface/test.out → ...rface_type_def/limited_interface/test.out
diff --git a/...face_type_def/limited_interface/test.yaml → ...face_type_def/limited_interface/test.yaml b/...face_type_def/limited_interface/test.yaml → ...face_type_def/limited_interface/test.yaml
diff --git a/...ce_type_def/protected_interface/input.ada → ...ce_type_def/protected_interface/input.ada b/...ce_type_def/protected_interface/input.ada → ...ce_type_def/protected_interface/input.ada
diff --git a/...ace_type_def/protected_interface/test.out → ...ace_type_def/protected_interface/test.out b/...ace_type_def/protected_interface/test.out → ...ace_type_def/protected_interface/test.out
diff --git a/...ce_type_def/protected_interface/test.yaml → ...ce_type_def/protected_interface/test.yaml b/...ce_type_def/protected_interface/test.yaml → ...ce_type_def/protected_interface/test.yaml
diff --git a/...rface_type_def/simple_interface/input.ada → ...rface_type_def/simple_interface/input.ada b/...rface_type_def/simple_interface/input.ada → ...rface_type_def/simple_interface/input.ada
diff --git a/...erface_type_def/simple_interface/test.out → ...erface_type_def/simple_interface/test.out b/...erface_type_def/simple_interface/test.out → ...erface_type_def/simple_interface/test.out
diff --git a/...rface_type_def/simple_interface/test.yaml → ...rface_type_def/simple_interface/test.yaml b/...rface_type_def/simple_interface/test.yaml → ...rface_type_def/simple_interface/test.yaml
diff --git a/...ests/unparsing/type_def/interface_type_def/synchronized_and_long_interface_list/input.ada b/...ests/unparsing/type_def/interface_type_def/synchronized_and_long_interface_list/input.ada
@@ -0,0 +1,6 @@
+type Combo_Sync_Interface is
+  synchronized interface
+  and My_Interface_1
+  and My_Interface_2
+  and My_Interface_3
+  and My_Interface_4;
diff --git a/...tests/unparsing/type_def/interface_type_def/synchronized_and_long_interface_list/test.out b/...tests/unparsing/type_def/interface_type_def/synchronized_and_long_interface_list/test.out
@@ -0,0 +1,6 @@
+type Combo_Sync_Interface is
+  synchronized interface
+  and My_Interface_1
+  and My_Interface_2
+  and My_Interface_3
+  and My_Interface_4;
diff --git a/..._def/synchro_and_interface_list/test.yaml → ...ronized_and_long_interface_list/test.yaml b/..._def/synchro_and_interface_list/test.yaml → ...ronized_and_long_interface_list/test.yaml
diff --git a/..._def/synchro_and_interface_list/input.ada → ...onized_and_short_interface_list/input.ada b/..._def/synchro_and_interface_list/input.ada → ...onized_and_short_interface_list/input.ada
diff --git a/...ests/unparsing/type_def/interface_type_def/synchronized_and_short_interface_list/test.out b/...ests/unparsing/type_def/interface_type_def/synchronized_and_short_interface_list/test.out
@@ -0,0 +1,2 @@
+type Combo_Sync_Interface is
+  synchronized interface and My_Interface_1 and My_Interface_2;
diff --git a/...sts/unparsing/type_def/interface_type_def/synchronized_and_short_interface_list/test.yaml b/...sts/unparsing/type_def/interface_type_def/synchronized_and_short_interface_list/test.yaml
@@ -0,0 +1,9 @@
+description: |
+    This test checks the formatting of a synchronized interface
+    type declaration with not empty interface list.
+    It is expected the declaration break after `is` keyword and
+    all the interface list elements and be indented relative to
+    the type keyword with a line continuation indentation.
+ 
+driver: unparser
+rule: type_decl
diff --git a/...type_def/synchronized_interface/input.ada → ...type_def/synchronized_interface/input.ada b/...type_def/synchronized_interface/input.ada → ...type_def/synchronized_interface/input.ada
diff --git a/..._type_def/synchronized_interface/test.out → ..._type_def/synchronized_interface/test.out b/..._type_def/synchronized_interface/test.out → ..._type_def/synchronized_interface/test.out
diff --git a/...type_def/synchronized_interface/test.yaml → ...type_def/synchronized_interface/test.yaml b/...type_def/synchronized_interface/test.yaml → ...type_def/synchronized_interface/test.yaml
diff --git a/...terface_type_def/task_interface/input.ada → ...terface_type_def/task_interface/input.ada b/...terface_type_def/task_interface/input.ada → ...terface_type_def/task_interface/input.ada
diff --git a/...nterface_type_def/task_interface/test.out → ...nterface_type_def/task_interface/test.out b/...nterface_type_def/task_interface/test.out → ...nterface_type_def/task_interface/test.out
diff --git a/...terface_type_def/task_interface/test.yaml → ...terface_type_def/task_interface/test.yaml b/...terface_type_def/task_interface/test.yaml → ...terface_type_def/task_interface/test.yaml
diff --git a/testsuite/tests/unparsing/type_def/real_type_def/decimal_fixed_point_type_def/long/input.ada b/testsuite/tests/unparsing/type_def/real_type_def/decimal_fixed_point_type_def/long/input.ada
@@ -0,0 +1 @@
+type Decimal_Fixed_Point_Type_Decl_Looooooooooooooooong is delta 0.01 digits 15;
diff --git a/testsuite/tests/unparsing/type_def/real_type_def/decimal_fixed_point_type_def/long/test.out b/testsuite/tests/unparsing/type_def/real_type_def/decimal_fixed_point_type_def/long/test.out
@@ -0,0 +1,2 @@
+type Decimal_Fixed_Point_Type_Decl_Looooooooooooooooong is
+  delta 0.01 digits 15;
diff --git a/...ng/decimal_fixed_point_type_def/test.yaml → ...cimal_fixed_point_type_def/long/test.yaml b/...ng/decimal_fixed_point_type_def/test.yaml → ...cimal_fixed_point_type_def/long/test.yaml
diff --git a/...ng/decimal_fixed_point_type_def/input.ada → ...imal_fixed_point_type_def/short/input.ada b/...ng/decimal_fixed_point_type_def/input.ada → ...imal_fixed_point_type_def/short/input.ada
diff --git a/...ing/decimal_fixed_point_type_def/test.out → ...cimal_fixed_point_type_def/short/test.out b/...ing/decimal_fixed_point_type_def/test.out → ...cimal_fixed_point_type_def/short/test.out
diff --git a/...suite/tests/unparsing/type_def/real_type_def/decimal_fixed_point_type_def/short/test.yaml b/...suite/tests/unparsing/type_def/real_type_def/decimal_fixed_point_type_def/short/test.yaml
@@ -0,0 +1,8 @@
+description: |
+    This test checks the formatting of a simple decimal fixed point type
+    declaration. It is expected the declaration be splitted in two
+    lines after the is keyword and the new line be indented with a
+    line continuation indentation (i.e., 2 spaces) stays on the same line.
+
+driver: unparser
+rule: type_decl
diff --git a/...oating_point_type_def/long_name/input.ada → ...oating_point_type_def/long_name/input.ada b/...oating_point_type_def/long_name/input.ada → ...oating_point_type_def/long_name/input.ada
diff --git a/...loating_point_type_def/long_name/test.out → ...loating_point_type_def/long_name/test.out b/...loating_point_type_def/long_name/test.out → ...loating_point_type_def/long_name/test.out
diff --git a/...oating_point_type_def/long_name/test.yaml → ...oating_point_type_def/long_name/test.yaml b/...oating_point_type_def/long_name/test.yaml → ...oating_point_type_def/long_name/test.yaml
diff --git a/...ating_point_type_def/short_name/input.ada → ...ating_point_type_def/short_name/input.ada b/...ating_point_type_def/short_name/input.ada → ...ating_point_type_def/short_name/input.ada
diff --git a/...oating_point_type_def/short_name/test.out → ...oating_point_type_def/short_name/test.out b/...oating_point_type_def/short_name/test.out → ...oating_point_type_def/short_name/test.out
diff --git a/...ating_point_type_def/short_name/test.yaml → ...ating_point_type_def/short_name/test.yaml b/...ating_point_type_def/short_name/test.yaml → ...ating_point_type_def/short_name/test.yaml
diff --git a/...ng_point_type_def/without_range/input.ada → ...ng_point_type_def/without_range/input.ada b/...ng_point_type_def/without_range/input.ada → ...ng_point_type_def/without_range/input.ada
diff --git a/...ing_point_type_def/without_range/test.out → ...ing_point_type_def/without_range/test.out b/...ing_point_type_def/without_range/test.out → ...ing_point_type_def/without_range/test.out
diff --git a/...ng_point_type_def/without_range/test.yaml → ...ng_point_type_def/without_range/test.yaml b/...ng_point_type_def/without_range/test.yaml → ...ng_point_type_def/without_range/test.yaml
diff --git a/...dinary_fixed_point_def/fraction/input.ada → ...dinary_fixed_point_def/fraction/input.ada b/...dinary_fixed_point_def/fraction/input.ada → ...dinary_fixed_point_def/fraction/input.ada
diff --git a/...rdinary_fixed_point_def/fraction/test.out → ...rdinary_fixed_point_def/fraction/test.out b/...rdinary_fixed_point_def/fraction/test.out → ...rdinary_fixed_point_def/fraction/test.out
diff --git a/...dinary_fixed_point_def/fraction/test.yaml → ...dinary_fixed_point_def/fraction/test.yaml b/...dinary_fixed_point_def/fraction/test.yaml → ...dinary_fixed_point_def/fraction/test.yaml
diff --git a/...ary_fixed_point_def/simple_type/input.ada → ...ary_fixed_point_def/simple_type/input.ada b/...ary_fixed_point_def/simple_type/input.ada → ...ary_fixed_point_def/simple_type/input.ada
diff --git a/...nary_fixed_point_def/simple_type/test.out → ...nary_fixed_point_def/simple_type/test.out b/...nary_fixed_point_def/simple_type/test.out → ...nary_fixed_point_def/simple_type/test.out
diff --git a/...ary_fixed_point_def/simple_type/test.yaml → ...ary_fixed_point_def/simple_type/test.yaml b/...ary_fixed_point_def/simple_type/test.yaml → ...ary_fixed_point_def/simple_type/test.yaml
diff --git a/testsuite/tests/unparsing/type_def/record_type_def/complete_discriminants_one_line/input.ada b/testsuite/tests/unparsing/type_def/record_type_def/complete_discriminants_one_line/input.ada
@@ -0,0 +1,6 @@
+type Fooooooooooooooo (Baaaaaaaar : Baaaaaaaaaaz := Baaar_Bazzz) is
+abstract tagged limited record
+   Day   : Integer range 1 .. 31;
+   Month : Month_Enum;
+   Year  : Integer range 0 .. 4000;
+end record;
diff --git a/testsuite/tests/unparsing/type_def/record_type_def/complete_discriminants_one_line/test.out b/testsuite/tests/unparsing/type_def/record_type_def/complete_discriminants_one_line/test.out
@@ -0,0 +1,6 @@
+type Fooooooooooooooo (Baaaaaaaar : Baaaaaaaaaaz := Baaar_Bazzz) is
+abstract tagged limited record
+   Day   : Integer range 1 .. 31;
+   Month : Month_Enum;
+   Year  : Integer range 0 .. 4000;
+end record;
diff --git a/testsuite/tests/unparsing/type_def/record_type_def/complete_discriminants_one_line/test.yaml b/testsuite/tests/unparsing/type_def/record_type_def/complete_discriminants_one_line/test.yaml
@@ -0,0 +1,6 @@
+driver: unparser
+rule: type_decl
+description: |
+  This test checks that `f_discriminants` are kept on the same line and
+  "`f_has_abstract` `f_has_tagged` `f_has_limited` `f_record_def`" are on a
+  seprate line.
diff --git a/testsuite/tests/unparsing/type_def/record_type_def/complete_long/input.ada b/testsuite/tests/unparsing/type_def/record_type_def/complete_long/input.ada
@@ -0,0 +1,8 @@
+type Fooooooooooooooo
+  (Baaaaaaaar : Baaaaaaaaaaz := Baaar_Bazzz;
+   Garply     : Corge        := Garply_Corge)
+is abstract tagged limited record
+   Day   : Integer range 1 .. 31;
+   Month : Month_Enum;
+   Year  : Integer range 0 .. 4000;
+end record;
diff --git a/testsuite/tests/unparsing/type_def/record_type_def/complete_long/test.out b/testsuite/tests/unparsing/type_def/record_type_def/complete_long/test.out
@@ -0,0 +1,8 @@
+type Fooooooooooooooo
+  (Baaaaaaaar : Baaaaaaaaaaz := Baaar_Bazzz;
+   Garply     : Corge        := Garply_Corge)
+is abstract tagged limited record
+   Day   : Integer range 1 .. 31;
+   Month : Month_Enum;
+   Year  : Integer range 0 .. 4000;
+end record;
diff --git a/testsuite/tests/unparsing/type_def/record_type_def/complete_long/test.yaml b/testsuite/tests/unparsing/type_def/record_type_def/complete_long/test.yaml
@@ -0,0 +1,6 @@
+driver: unparser
+rule: type_decl
+description:
+  This test checks that long `f_discriminants` are formatted in multiple lines.
+  It also checks that `is` is in its own line followed by
+  "`f_has_abstract` `f_has_tagged` `f_has_limited` `f_record_def`".
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		array (Buffer_Index_1, Buffer_Index_2, Buffer_Index_3, Buffer_Index_4, Buffer_Index_5) of Character.Long_Dotted_Name.Long_Dotted_Name.Long_Dotted_Name.Long_Dotted_Name
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		type Derived_Interface is new Int1 and Int2 with null record;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		type Foo is new Bar and Baz and Corge and Garply and Fred and Fnoord with record A : B; end record;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		type Base_Type is interface and Interface_1 and Interface_2;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		type Combo_Sync_Interface is
		synchronized interface and My_Interface_1 and My_Interface_2;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		type Decimal_Fixed_Point_Type_Decl_Looooooooooooooooong is delta 0.01 digits 15;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		type Decimal_Fixed_Point_Type_Decl_Looooooooooooooooong is
		delta 0.01 digits 15;