Merge branch 'issue_1329' into 'master'

Unparsing: add configuration for NullSubpDecl Closes #1329 See merge request eng/libadalang/libadalang!1598
AdaCore · Mar 28, 2024 · 0e08273 · 0e08273
2 parents 13c852a + 3a8613b
commit 0e08273
Show file tree

Hide file tree

Showing 13 changed files with 2,651 additions and 0 deletions.
diff --git a/extensions/default_unparsing_config.json b/extensions/default_unparsing_config.json
@@ -2883,6 +2883,44 @@
         ]
       }
     },
+    "NullSubpDecl": {
+      "node": {
+        "kind": "group",
+        "document": [
+          {
+            "kind": "recurse_field",
+            "field": "f_overriding"
+          },
+          {
+            "kind": "recurse_field",
+            "field": "f_subp_spec"
+          },
+          "line",
+          {
+            "kind": "text",
+            "text": "is"
+          },
+          {
+            "kind": "text",
+            "text": "null"
+          },
+          {
+            "kind": "recurse_field",
+            "field": "f_aspects"
+          },
+          {
+            "kind": "text",
+            "text": ";"
+          }
+        ]
+      },
+      "fields": {
+        "f_aspects": [
+          "hardlineWithoutBreakParent",
+          "recurse"
+        ]
+      }
+    },
     "ObjectDecl": {
       "node": {
         "kind": "group",

diff --git a/testsuite/tests/unparsing/null_subp_decl/long/doc-baseline.json b/testsuite/tests/unparsing/null_subp_decl/long/doc-baseline.json
diff --git a/testsuite/tests/unparsing/null_subp_decl/long/input.ada b/testsuite/tests/unparsing/null_subp_decl/long/input.ada
@@ -0,0 +1,5 @@
+procedure Foo
+  (AAAAAAAAAAAA : Bar;
+   BBBBBBBBBBBB : Baz;
+   CCCCCCCCCCCC : Qux;
+   DDDDDDDDDDDD : Corge) is null;
diff --git a/testsuite/tests/unparsing/null_subp_decl/long/test.out b/testsuite/tests/unparsing/null_subp_decl/long/test.out
@@ -0,0 +1,6 @@
+procedure Foo
+  (AAAAAAAAAAAA : Bar;
+   BBBBBBBBBBBB : Baz;
+   CCCCCCCCCCCC : Qux;
+   DDDDDDDDDDDD : Corge)
+is null;
diff --git a/testsuite/tests/unparsing/null_subp_decl/long/test.yaml b/testsuite/tests/unparsing/null_subp_decl/long/test.yaml
@@ -0,0 +1,5 @@
+driver: unparser
+rule: null_subp_decl
+description: |
+  Test that a line break is added before the `is` keyword and that it has the
+  same indentation as the `function` keyword.
diff --git a/testsuite/tests/unparsing/null_subp_decl/short/doc-baseline.json b/testsuite/tests/unparsing/null_subp_decl/short/doc-baseline.json
diff --git a/testsuite/tests/unparsing/null_subp_decl/short/input.ada b/testsuite/tests/unparsing/null_subp_decl/short/input.ada
@@ -0,0 +1 @@
+procedure Foo(A:Bar;B:Baz;C:Qux;D:Corge)is null;
diff --git a/testsuite/tests/unparsing/null_subp_decl/short/test.out b/testsuite/tests/unparsing/null_subp_decl/short/test.out
@@ -0,0 +1 @@
+procedure Foo (A : Bar; B : Baz; C : Qux; D : Corge) is null;
diff --git a/testsuite/tests/unparsing/null_subp_decl/short/test.yaml b/testsuite/tests/unparsing/null_subp_decl/short/test.yaml
@@ -0,0 +1,4 @@
+driver: unparser
+rule: null_subp_decl
+description: |
+  Test that no line break are added.
diff --git a/testsuite/tests/unparsing/null_subp_decl/short_with_aspects/doc-baseline.json b/testsuite/tests/unparsing/null_subp_decl/short_with_aspects/doc-baseline.json
diff --git a/testsuite/tests/unparsing/null_subp_decl/short_with_aspects/input.ada b/testsuite/tests/unparsing/null_subp_decl/short_with_aspects/input.ada
@@ -0,0 +1 @@
+procedure Foo (A : Bar; B : Baz; C : Qux; D : Corge) is null with Garplyyyyyyy;
diff --git a/testsuite/tests/unparsing/null_subp_decl/short_with_aspects/test.out b/testsuite/tests/unparsing/null_subp_decl/short_with_aspects/test.out
@@ -0,0 +1,2 @@
+procedure Foo (A : Bar; B : Baz; C : Qux; D : Corge) is null
+with Garplyyyyyyy;
diff --git a/testsuite/tests/unparsing/null_subp_decl/short_with_aspects/test.yaml b/testsuite/tests/unparsing/null_subp_decl/short_with_aspects/test.yaml
@@ -0,0 +1,5 @@
+driver: unparser
+rule: null_subp_decl
+description: |
+  Test that a line break is added before the `with` keyword and that it has the
+  same indentation as the `function` keyword.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		procedure Foo(A:Bar;B:Baz;C:Qux;D:Corge)is null;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		procedure Foo (A : Bar; B : Baz; C : Qux; D : Corge) is null;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		procedure Foo (A : Bar; B : Baz; C : Qux; D : Corge) is null
		with Garplyyyyyyy;