Merge pull request #554 from tweag/erin/nickel-annotation-idempotency

Nickel: Resolve annotation idempotency

topiary/languages/nickel.scm

@@ -264,10 +264,26 @@
   (annot) @prepend_indent_start
 ) @append_indent_end
 
+; Start a scope from the node previous to the annotations.
+; This properly checks if the annotations were intended to be
+; on newlines in such cases as:
+; id
+;   | a -> a
+; which, without the annotations scope, would consider the annotations to be a
+; single line node and format it as such:
+; id | a -> a
+(
+  (#scope_id! "annotations")
+  (_) @begin_scope
+  .
+  (annot) @end_scope
+)
+
 ; Put each annotation -- and the equals sign, if it follows annotations
 ; -- on a new line, in a multi-line context.
 (annot
-  (annot_atom) @prepend_spaced_softline
+  (#scope_id! "annotations")
+  (annot_atom) @prepend_spaced_scoped_softline
 )
 
 (

topiary/tests/samples/expected/nickel.ncl

@@ -2435,5 +2435,8 @@
       ```
       "%
       = fun s => %enum_from_str% s,
-  }
+  },
+
+  id
+    | a -> a,
 }

topiary/tests/samples/input/nickel.ncl

@@ -2425,5 +2425,8 @@
       ```
       "%
       = fun s => %enum_from_str% s,
-  }
+  },
+
+  id |
+    a -> a,
 }