Merge pull request #577 from tweag/571-nickel-formatting-regression

Append scope to node before annotation
tweag · Jul 13, 2023 · 322ff5a · 322ff5a
2 parents d4dbf3f + 243b62a
commit 322ff5a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/topiary/languages/nickel.scm b/topiary/languages/nickel.scm
@@ -274,7 +274,7 @@
 ; id | a -> a
 (
   (#scope_id! "annotations")
-  (_) @prepend_begin_scope
+  (_) @append_begin_scope
   .
   (annot) @append_end_scope
 )

diff --git a/topiary/tests/samples/expected/nickel.ncl b/topiary/tests/samples/expected/nickel.ncl
@@ -10,6 +10,18 @@
       id
         | a -> a
     },
+    #571
+    {
+      b =
+        {
+          kind = 'ReplicationController,
+        } | KubernetesConfig,
+      c =
+        {
+          kind = 'ReplicationController,
+        }
+          | KubernetesConfig
+    },
 
     # Interpolated record operation chains (in
     # a multi-line comment)

diff --git a/topiary/tests/samples/input/nickel.ncl b/topiary/tests/samples/input/nickel.ncl
@@ -10,6 +10,16 @@
       id |
         a -> a
     },
+    #571
+    {
+      b = {
+        kind = 'ReplicationController,
+      } | KubernetesConfig,
+      c = {
+        kind = 'ReplicationController,
+      }
+      | KubernetesConfig
+    },
 
 # Interpolated record operation chains (in
 # a multi-line comment)