feat(format): Format do expressions

gluon-lang · Dec 2, 2017 · 71157db · 71157db
1 parent a94c684
commit 71157db
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/format/src/pretty_print.rs b/format/src/pretty_print.rs
@@ -3,7 +3,7 @@ use std::{iter, ops};
 use itertools::{Either, Itertools};
 use pretty::{Arena, DocAllocator, DocBuilder};
 
-use base::ast::{Expr, Pattern, SpannedExpr, SpannedPattern, ValueBinding};
+use base::ast::{Do, Expr, Pattern, SpannedExpr, SpannedPattern, ValueBinding};
 use base::kind::Kind;
 use base::pos::{self, BytePos, HasSpan, Span, Spanned};
 use base::source;
@@ -288,6 +288,22 @@ impl<'a: 'e, 'e> Printer<'a, 'e> {
                     self.pretty_expr_(binds.last().unwrap().alias.span.end, body)
                 ].group()
                 }
+                Expr::Do(Do {
+                    ref id,
+                    ref bound,
+                    ref body,
+                    ..
+                }) => chain![arena;
+                        chain![arena;
+                            "do",
+                            self.space_before(id.span.start),
+                            id.value.name.as_ref(),
+                            self.space_after(id.span.end),
+                            "=",
+                            self.hang(arena.nil(), bound).group()
+                        ].group(),
+                        self.pretty_expr_(bound.span.end, body)
+                    ],
                 Expr::Error(_) => arena.text("<error>"),
             };
         comments.append(doc)

diff --git a/format/tests/pretty_print.rs b/format/tests/pretty_print.rs
@@ -300,3 +300,13 @@ let semigroup =
 "#;
     assert_diff!(&format_expr(expr).unwrap(), expr, " ", 0);
 }
+
+#[test]
+fn do_expression() {
+    let expr = r#"
+do /* x1 */ x /* x2 */ = Some 1
+// test
+test abc 1232 ""
+"#;
+    assert_diff!(&format_expr(expr).unwrap(), expr, " ", 0);
+}