Merge branch 'gnatformat-issue_47' into 'master'

Unparsing: Simplify QualExpr tests and fix nested QualExprs config Closes eng/ide/gnatformat#47 See merge request eng/libadalang/libadalang!1713
AdaCore · Jul 30, 2024 · 7f04367 · 7f04367
2 parents e951332 + 2f6f9c5
commit 7f04367
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 28 deletions.
diff --git a/extensions/default_unparsing_config.json b/extensions/default_unparsing_config.json
@@ -239,8 +239,11 @@
           "field": "f_designators"
         },
         {
-          "kind": "recurse_field",
-          "field": "f_r_expr"
+          "kind": "innerRoot",
+          "contents": {
+            "kind": "recurse_field",
+            "field": "f_r_expr"
+          }
         }
       ],
       "fields": {

diff --git a/testsuite/tests/unparsing/aggregate/nested/input.ada b/testsuite/tests/unparsing/aggregate/nested/input.ada
@@ -0,0 +1,5 @@
+Formatted_Edits'
+  (Unit => Unit,
+   Edit => Text_Edit'(Location => Text_Edit_Sloc, Text => Prettier_Ada.Documents.Format (Long_Document, Format_Options)),
+   Formatted   => Enclosing_Node,
+   Diagnostics => Diagnostics)
diff --git a/testsuite/tests/unparsing/aggregate/nested/test.out b/testsuite/tests/unparsing/aggregate/nested/test.out
@@ -0,0 +1,9 @@
+Formatted_Edits'
+  (Unit        => Unit,
+   Edit        =>
+     Text_Edit'
+       (Location => Text_Edit_Sloc,
+        Text     =>
+          Prettier_Ada.Documents.Format (Long_Document, Format_Options)),
+   Formatted   => Enclosing_Node,
+   Diagnostics => Diagnostics)
diff --git a/testsuite/tests/unparsing/aggregate/nested/test.yaml b/testsuite/tests/unparsing/aggregate/nested/test.yaml
@@ -0,0 +1,6 @@
+description: |
+    This test checks the formatting of a qualified expression inside another
+    qualified expression.
+
+driver: unparser
+rule: expr
diff --git a/testsuite/tests/unparsing/qual_expr/expr_1/test.yaml b/testsuite/tests/unparsing/qual_expr/expr_1/test.yaml
diff --git a/testsuite/tests/unparsing/qual_expr/expr_2/input.ada b/testsuite/tests/unparsing/qual_expr/expr_2/input.ada
diff --git a/testsuite/tests/unparsing/qual_expr/expr_2/test.out b/testsuite/tests/unparsing/qual_expr/expr_2/test.out
diff --git a/testsuite/tests/unparsing/qual_expr/expr_2/test.yaml b/testsuite/tests/unparsing/qual_expr/expr_2/test.yaml
diff --git a/testsuite/tests/unparsing/qual_expr/expr_3/input.ada b/testsuite/tests/unparsing/qual_expr/expr_3/input.ada
diff --git a/testsuite/tests/unparsing/qual_expr/expr_3/test.out b/testsuite/tests/unparsing/qual_expr/expr_3/test.out
diff --git a/testsuite/tests/unparsing/qual_expr/expr_3/test.yaml b/testsuite/tests/unparsing/qual_expr/expr_3/test.yaml
diff --git a/testsuite/tests/unparsing/qual_expr/long/input.ada b/testsuite/tests/unparsing/qual_expr/long/input.ada
@@ -1 +1,3 @@
-VeeeeeeeeeeeeeeeeeeeerrrrrrrrrrryLooooooooooooooooooooonnnnnnnngQualName'[Val1,Val2]
+VeeeeeeeeeeeeeeeeeeeerrrrrrrrrrryLooooooooooooooooooooonnnnnnnngQualName'
+  [Val_11111111111111111111111111111,
+   Val22222222222222222222222222222222222222]
diff --git a/testsuite/tests/unparsing/qual_expr/long/test.out b/testsuite/tests/unparsing/qual_expr/long/test.out
@@ -1,2 +1,3 @@
 VeeeeeeeeeeeeeeeeeeeerrrrrrrrrrryLooooooooooooooooooooonnnnnnnngQualName'
-  [Val1, Val2]
+  [Val_11111111111111111111111111111,
+   Val22222222222222222222222222222222222222]
diff --git a/testsuite/tests/unparsing/qual_expr/long/test.yaml b/testsuite/tests/unparsing/qual_expr/long/test.yaml
@@ -1,7 +1,8 @@
 description: |
     This test checks the formatting of a qualified expression.
     It is expected the declaration breaks after `'` and the new
-    line be indented.
- 
+    line be indented. It is also expected that the indentation of the aggregate
+    members is relative to the `(` token.
+
 driver: unparser
 rule: expr
diff --git a/...ests/unparsing/qual_expr/expr_1/input.ada → ...tests/unparsing/qual_expr/short/input.ada b/...ests/unparsing/qual_expr/expr_1/input.ada → ...tests/unparsing/qual_expr/short/input.ada
diff --git a/...tests/unparsing/qual_expr/expr_1/test.out → .../tests/unparsing/qual_expr/short/test.out b/...tests/unparsing/qual_expr/expr_1/test.out → .../tests/unparsing/qual_expr/short/test.out
diff --git a/testsuite/tests/unparsing/qual_expr/short/test.yaml b/testsuite/tests/unparsing/qual_expr/short/test.yaml
@@ -0,0 +1,7 @@
+description: |
+    This test checks the formatting of a short qualified expression with
+    parenthesis. It is expected the qualified expression stays on a single
+    line.
+
+driver: unparser
+rule: expr