Fix CallStmt parameters aligment when breaks

AdaCore · Jul 15, 2024 · 6961814 · 6961814
1 parent a78dc0f
commit 6961814
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 3 deletions.
diff --git a/extensions/default_unparsing_config.json b/extensions/default_unparsing_config.json
@@ -668,8 +668,11 @@
                 "text": "("
               },
               {
-                "kind": "recurse_field",
-                "field": "f_suffix"
+                "kind": "innerRoot",
+                "contents": {
+                  "kind": "recurse_field",
+                  "field": "f_suffix"
+                }
               },
               {
                 "kind": "text",
@@ -5857,4 +5860,4 @@
     }
   },
   "max_empty_lines": 1
-}
+}
diff --git a/...suite/tests/unparsing/call_stmt/input.ada → .../tests/unparsing/call_stmt/long/input.ada b/...suite/tests/unparsing/call_stmt/input.ada → .../tests/unparsing/call_stmt/long/input.ada
diff --git a/testsuite/tests/unparsing/call_stmt/test.out → ...e/tests/unparsing/call_stmt/long/test.out b/testsuite/tests/unparsing/call_stmt/test.out → ...e/tests/unparsing/call_stmt/long/test.out
diff --git a/...suite/tests/unparsing/call_stmt/test.yaml → .../tests/unparsing/call_stmt/long/test.yaml b/...suite/tests/unparsing/call_stmt/test.yaml → .../tests/unparsing/call_stmt/long/test.yaml
diff --git a/testsuite/tests/unparsing/call_stmt/param_align/input.ada b/testsuite/tests/unparsing/call_stmt/param_align/input.ada
@@ -0,0 +1,5 @@
+Foo
+  (AAAA => Foo_1,
+  BB => Foo_2,
+  CCCCCCC => Foo_3,
+  DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD => 7);
diff --git a/testsuite/tests/unparsing/call_stmt/param_align/test.out b/testsuite/tests/unparsing/call_stmt/param_align/test.out
@@ -0,0 +1,5 @@
+Foo
+  (AAAA => Foo_1,
+   BB => Foo_2,
+   CCCCCCC => Foo_3,
+   DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD => 7);
diff --git a/testsuite/tests/unparsing/call_stmt/param_align/test.yaml b/testsuite/tests/unparsing/call_stmt/param_align/test.yaml
@@ -0,0 +1,6 @@
+driver: unparser
+rule: stmt
+description: |
+  Base test for a `CallStmt`. Tests that if the statement is too long, the
+  underlying `CallExpr` breaks. Additionally, this test checks this behaviour
+  when the `;` is at the line length limit.