Fix formatting of expr/eval_expr

wrt. newlines being added at the end

Author: guusw

shards/lang/src/formatter.rs

@@ -238,6 +238,9 @@ impl<'a> FormatterVisitor<'a> {
       }
     }
     self.out.write_all(s.as_bytes()).unwrap();
+
+    // Enable for testing
+    // self.out.flush().unwrap();
   }
 
   fn write(&mut self, s: &str, top: FormatterTop) {
@@ -597,6 +600,7 @@ impl<'a> RuleVisitor for FormatterVisitor<'a> {
       self.newline();
     }
     self.write_joined(")");
+    self.set_last_char(pair.as_span().end());
   }
   fn v_eval_expr<T: FnOnce(&mut Self)>(
     &mut self,
@@ -617,6 +621,7 @@ impl<'a> RuleVisitor for FormatterVisitor<'a> {
       self.newline();
     }
     self.write_joined(")");
+    self.set_last_char(pair.as_span().end());
   }
   fn v_shards<T: FnOnce(&mut Self)>(&mut self, pair: Pair<Rule>, inner: T) {
     self.with_context(Context::Pipeline, |_self| {

shards/lang/src/lib.rs

@@ -18,7 +18,7 @@ pub mod rule_visitor;
 
  use crate::ast::*;
 
-use core::fmt;
+use core::fmt;  
 
 use std::borrow::Cow;
 use std::ops::Deref;

shards/lang/src/tests/test16.expected.shs

@@ -0,0 +1,9 @@
+(Log
+  a | Set("h")
+)
+; Blank
+
+#(Log
+  a | Set("h")
+) ; At end
+; JJ

shards/lang/src/tests/test16.shs

@@ -0,0 +1,9 @@
+(Log
+  a | Set("h")
+)
+; Blank
+
+#(Log
+  a | Set("h")
+) ; At end
+; JJ

shards/lang/src/tests/test17.expected.shs

@@ -0,0 +1,32 @@
+{
+  a: {
+    j: 2
+  }
+}
+
+{
+  a: {
+    j: 2
+    j: 2
+    j: 2
+    j: [
+      1 2 3
+    ]
+    j: 2
+    j: 2
+  }
+}
+
+@define(my-define 2)
+
+{
+  ShardParams(A: 1
+    B: {
+      Something({
+        ; Comment
+        Log("Another callback")
+      })
+    }
+    C: 3
+  )
+}

shards/lang/src/tests/test17.shs

@@ -0,0 +1,32 @@
+{
+  a: {
+    j: 2
+  }
+}
+
+{
+  a: {
+    j: 2
+    j: 2
+    j: 2
+    j: [
+      1 2 3
+    ]
+    j: 2
+    j: 2
+  }
+}
+
+@define(my-define 2)
+
+{
+  ShardParams(A: 1
+    B: {
+      Something({
+        ; Comment
+        Log("Another callback")
+      })
+    }
+    C: 3
+  )
+}