From edff2ae6803928e59eae96e2f75cd62a7e24c76f Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 9 Jun 2021 10:45:49 +0200
Subject: [PATCH] Remove template pretty printing

Was buggy and pretty useless anyway since it couldn't peek into function templates.
---
 src/pretty.rs                       | 163 +++++++---------------------
 src/syntax/expr.rs                  |  14 ++-
 tests/ref/code/call-invalid.png     | Bin 2834 -> 2975 bytes
 tests/ref/code/call.png             | Bin 5972 -> 6150 bytes
 tests/ref/code/dict.png             | Bin 1612 -> 1602 bytes
 tests/typ/code/call-invalid.typ     |   1 -
 tests/typ/code/call.typ             |   5 +-
 tests/typ/code/dict.typ             |   2 +-
 tests/typ/library/basic.typ         |   2 +-
 tools/support/typst.tmLanguage.json |   2 +-
 10 files changed, 50 insertions(+), 139 deletions(-)

diff --git a/src/pretty.rs b/src/pretty.rs
index 9987e5063..dc1e284ca 100644
--- a/src/pretty.rs
+++ b/src/pretty.rs
@@ -17,37 +17,12 @@ where
     p.finish()
 }
 
-/// Pretty print an item with a expression map and return the resulting string.
-pub fn pretty_with_map<T>(item: &T, map: &ExprMap) -> String
-where
-    T: PrettyWithMap + ?Sized,
-{
-    let mut p = Printer::new();
-    item.pretty_with_map(&mut p, Some(map));
-    p.finish()
-}
-
 /// Pretty print an item.
 pub trait Pretty {
     /// Pretty print this item into the given printer.
     fn pretty(&self, p: &mut Printer);
 }
 
-/// Pretty print an item with an expression map that applies to it.
-pub trait PrettyWithMap {
-    /// Pretty print this item into the given printer.
-    fn pretty_with_map(&self, p: &mut Printer, map: Option<&ExprMap>);
-}
-
-impl<T> Pretty for T
-where
-    T: PrettyWithMap,
-{
-    fn pretty(&self, p: &mut Printer) {
-        self.pretty_with_map(p, None);
-    }
-}
-
 /// A buffer into which items are printed.
 pub struct Printer {
     buf: String,
@@ -103,16 +78,16 @@ impl Write for Printer {
     }
 }
 
-impl PrettyWithMap for Tree {
-    fn pretty_with_map(&self, p: &mut Printer, map: Option<&ExprMap>) {
+impl Pretty for Tree {
+    fn pretty(&self, p: &mut Printer) {
         for node in self {
-            node.pretty_with_map(p, map);
+            node.pretty(p);
         }
     }
 }
 
-impl PrettyWithMap for Node {
-    fn pretty_with_map(&self, p: &mut Printer, map: Option<&ExprMap>) {
+impl Pretty for Node {
+    fn pretty(&self, p: &mut Printer) {
         match self {
             // TODO: Handle escaping.
             Self::Text(text) => p.push_str(text),
@@ -122,18 +97,13 @@ impl PrettyWithMap for Node {
             Self::Strong(_) => p.push('*'),
             Self::Emph(_) => p.push('_'),
             Self::Raw(raw) => raw.pretty(p),
-            Self::Heading(heading) => heading.pretty_with_map(p, map),
-            Self::List(list) => list.pretty_with_map(p, map),
+            Self::Heading(heading) => heading.pretty(p),
+            Self::List(list) => list.pretty(p),
             Self::Expr(expr) => {
-                if let Some(map) = map {
-                    let value = &map[&(expr as *const _)];
-                    value.pretty(p);
-                } else {
-                    if expr.has_short_form() {
-                        p.push('#');
-                    }
-                    expr.pretty(p);
+                if expr.has_short_form() {
+                    p.push('#');
                 }
+                expr.pretty(p);
             }
         }
     }
@@ -195,20 +165,20 @@ impl Pretty for RawNode {
     }
 }
 
-impl PrettyWithMap for HeadingNode {
-    fn pretty_with_map(&self, p: &mut Printer, map: Option<&ExprMap>) {
+impl Pretty for HeadingNode {
+    fn pretty(&self, p: &mut Printer) {
         for _ in 0 .. self.level {
             p.push('#');
         }
         p.push(' ');
-        self.body.pretty_with_map(p, map);
+        self.body.pretty(p);
     }
 }
 
-impl PrettyWithMap for ListNode {
-    fn pretty_with_map(&self, p: &mut Printer, map: Option<&ExprMap>) {
+impl Pretty for ListNode {
+    fn pretty(&self, p: &mut Printer) {
         p.push_str("- ");
-        self.body.pretty_with_map(p, map);
+        self.body.pretty(p);
     }
 }
 
@@ -278,7 +248,7 @@ impl Pretty for Named {
 impl Pretty for TemplateExpr {
     fn pretty(&self, p: &mut Printer) {
         p.push('[');
-        self.tree.pretty_with_map(p, None);
+        self.tree.pretty(p);
         p.push(']');
     }
 }
@@ -488,7 +458,6 @@ impl Pretty for Value {
             Value::Relative(v) => v.pretty(p),
             Value::Linear(v) => v.pretty(p),
             Value::Color(v) => v.pretty(p),
-            // TODO: Handle like text when directly in template.
             Value::Str(v) => v.pretty(p),
             Value::Array(v) => v.pretty(p),
             Value::Dict(v) => v.pretty(p),
@@ -529,29 +498,7 @@ impl Pretty for DictValue {
 
 impl Pretty for TemplateValue {
     fn pretty(&self, p: &mut Printer) {
-        p.push('[');
-        for part in self {
-            part.pretty(p);
-        }
-        p.push(']');
-    }
-}
-
-impl Pretty for TemplateNode {
-    fn pretty(&self, p: &mut Printer) {
-        match self {
-            Self::Tree { tree, map } => tree.pretty_with_map(p, Some(map)),
-            Self::Str(s) => p.push_str(s),
-            Self::Func(func) => func.pretty(p),
-        }
-    }
-}
-
-impl Pretty for TemplateFunc {
-    fn pretty(&self, p: &mut Printer) {
-        p.push_str("<node ");
-        p.push_str(self.name());
-        p.push('>');
+        p.push_str("<template>");
     }
 }
 
@@ -636,12 +583,20 @@ pretty_display! {
 
 #[cfg(test)]
 mod tests {
-    use std::collections::{BTreeMap, HashMap};
-    use std::rc::Rc;
+    use std::collections::BTreeMap;
 
     use super::*;
     use crate::parse::parse;
 
+    macro_rules! map {
+        ($($k:ident: $v:expr),* $(,)?) => {{
+            #[allow(unused_mut)]
+            let mut m = BTreeMap::new();
+            $(m.insert(stringify!($k).to_string(), $v);)*
+            m
+        }};
+    }
+
     #[track_caller]
     fn roundtrip(src: &str) {
         test_parse(src, src);
@@ -698,7 +653,6 @@ mod tests {
     fn test_pretty_print_expr() {
         // Basic expressions.
         roundtrip("{none}");
-        roundtrip("{hi}");
         roundtrip("{true}");
         roundtrip("{10}");
         roundtrip("{3.14}");
@@ -708,6 +662,7 @@ mod tests {
         roundtrip("{#abcdef}");
         roundtrip(r#"{"hi"}"#);
         test_parse(r#"{"let's \" go"}"#, r#"{"let's \" go"}"#);
+        roundtrip("{hi}");
 
         // Arrays.
         roundtrip("{()}");
@@ -738,7 +693,7 @@ mod tests {
         roundtrip("{not true}");
         roundtrip("{1 + 3}");
 
-        // Function calls.
+        // Functions.
         roundtrip("{v()}");
         roundtrip("{v()()}");
         roundtrip("{v(1)}");
@@ -747,22 +702,21 @@ mod tests {
         roundtrip("#v(1)");
         roundtrip("#v(1, 2)[*Ok*]");
         roundtrip("#v(1, f[2])");
-
-        // Closures.
         roundtrip("{(a, b) => a + b}");
 
-        // Keywords.
+        // Control flow.
         roundtrip("#let x = 1 + 2");
         test_parse("#let f(x) = y", "#let f = (x) => y");
         test_parse("#if x [y] #else [z]", "#if x [y] else [z]");
         roundtrip("#while x {y}");
         roundtrip("#for x in y {z}");
         roundtrip("#for k, x in y {z}");
+        roundtrip("#import \"file.typ\" using *");
+        roundtrip("#include \"chapter1.typ\"");
     }
 
     #[test]
     fn test_pretty_print_value() {
-        // Simple values.
         test_value(Value::None, "none");
         test_value(false, "false");
         test_value(12i64, "12");
@@ -776,64 +730,21 @@ mod tests {
         test_value("\n", r#""\n""#);
         test_value("\\", r#""\\""#);
         test_value("\"", r#""\"""#);
-
-        // Array.
         test_value(Value::Array(vec![]), "()");
         test_value(vec![Value::None], "(none,)");
         test_value(vec![Value::Int(1), Value::Int(2)], "(1, 2)");
-
-        // Dictionary.
-        let mut dict = BTreeMap::new();
-        test_value(dict.clone(), "(:)");
-        dict.insert("one".into(), Value::Int(1));
-        test_value(dict.clone(), "(one: 1)");
-        dict.insert("two".into(), Value::Bool(false));
-        test_value(dict, "(one: 1, two: false)");
-
-        // Template.
+        test_value(map![], "(:)");
+        test_value(map![one: Value::Int(1)], "(one: 1)");
         test_value(
-            vec![
-                TemplateNode::Tree {
-                    tree: Rc::new(vec![Node::Strong(Span::ZERO)]),
-                    map: HashMap::new(),
-                },
-                TemplateNode::Func(TemplateFunc::new("example", |_| {})),
-            ],
-            "[*<node example>]",
+            map![two: Value::Bool(false), one: Value::Int(1)],
+            "(one: 1, two: false)",
         );
-
-        // Function.
         test_value(FuncValue::new(None, |_, _| Value::None), "<function>");
         test_value(
             FuncValue::new(Some("nil".into()), |_, _| Value::None),
             "<function nil>",
         );
-
-        // Any.
         test_value(AnyValue::new(1), "1");
-
-        // Error.
         test_value(Value::Error, "<error>");
     }
-
-    #[test]
-    fn test_pretty_print_args() {
-        // Arguments.
-        assert_eq!(
-            pretty(&FuncArgs {
-                span: Span::ZERO,
-                items: vec![
-                    FuncArg {
-                        name: Some(Spanned::zero("a".into())),
-                        value: Spanned::zero(Value::Int(1)),
-                    },
-                    FuncArg {
-                        name: None,
-                        value: Spanned::zero(Value::Int(2)),
-                    },
-                ],
-            }),
-            "(a: 1, 2)",
-        );
-    }
 }
diff --git a/src/syntax/expr.rs b/src/syntax/expr.rs
index fd106eb81..e0135d1c3 100644
--- a/src/syntax/expr.rs
+++ b/src/syntax/expr.rs
@@ -97,12 +97,14 @@ impl Expr {
     /// Whether the expression can be shortened in markup with a hashtag.
     pub fn has_short_form(&self) -> bool {
         matches!(self,
-            Expr::Ident(_)
-            | Expr::Call(_)
-            | Expr::Let(_)
-            | Expr::If(_)
-            | Expr::While(_)
-            | Expr::For(_)
+            Self::Ident(_)
+            | Self::Call(_)
+            | Self::Let(_)
+            | Self::If(_)
+            | Self::While(_)
+            | Self::For(_)
+            | Self::Import(_)
+            | Self::Include(_)
         )
     }
 }
diff --git a/tests/ref/code/call-invalid.png b/tests/ref/code/call-invalid.png
index e024e6ced404e19081016ded0d7ba21f5c139096..b2f62ac21b74c487f8d439104cb8c675755215f4 100644
GIT binary patch
literal 2975
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

literal 2834
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

diff --git a/tests/ref/code/call.png b/tests/ref/code/call.png
index ae05f61735f2faa384c6f12ddea59ff4a9b4ca60..fd2abbd8bdde7e7002ecb42f40581485b6b0f4e8 100644
GIT binary patch
literal 6150
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
KNV8tu5%(WfIKjFA

literal 5972
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

diff --git a/tests/ref/code/dict.png b/tests/ref/code/dict.png
index 09f69b56b0987ed3e6e85a71cf2c36ca1e4f98c6..730ff6d896e6609b0f356e1648731598b98871fe 100644
GIT binary patch
delta 1555
zcmZ9MdpOez7{`Cxe%fS?d&H3$$|1Sm9Zj_mPVuPZQf{&3mcr2Z&8Q=_s8vI!HZiJ`
zOK!O)mq@wn7$w(`8m76$X(LDH^gKPC_pkSP-tRx(_x-%z4s;VbLlY8r+-K(=J1{#u
z9GPn%FZOm276qu{karOUh#uG!K$0fm#6yvx$m=+9oiToLwK2<ZlVyu8|12|;c4S+^
z7TNs}7QHFC(bqr;-P-!}mY7T`4#Y|)q4r_m-`l1L4HjuV=bSmXM4VQB&PdQtG3y%2
zrbIyP=|ykPbK0`Jjsu1Af|Lw<^M=KU`=eqoLSFS6Qcg{DVb1P3ot^LR_@Pf4(7kaS
zJ{u>Tv@amp@$zneX&_qrcGO~`?snsW2Y~}evjcVq+NK#u(d#9eFr!Y@?*wP8fp)jW
z$1RI#s0#EQDAp7N%!Hhm#}qAFCUYcLp>4MsKIITz;RkH2V(@dT3dbJ656oiy&RPm}
z#kyC-*<_3L9=0oV8gT-Q3J>mQAR83_zH;?Pci)VTS)%r8YoJSlMNDaB@sm#_>+{wi
zyL)+2pJ7WO5nDxt#p+27(3fx*&W_0SP!OP1<?e)l8vm1(U7l28kNdvym;ks6d-)Bj
z<k2~OK)Yo~e_~@G^K7Z4Ahth~#aMWQx)(t!joPyEvg)R<Cs%ezZ6sRmx(H1bV)8s?
ze7o_kgqgY{trcMQR*IiqHJvpYY%vs)NKLGy(Q9_)4(Vw;NgGjY>~wD6u{+)$)-pT@
z?dN3aSTU=)NsfBC)^uWkOJ;CBV$CV5GZ>z^3aJwU*<P)cl}}LNLA+=dq;BkT8lMrY
z!Q-0(&68x?f*^*O-<_;Zx@c`=XHwkqtZ&86r;NbEKHEi@4x_TqFEA@McI0>?xKTZ<
z?MV-xYS8`ALxsoG;;m#Im@$7G2ZhQP9e&+fyP+0&8)xp&))0k)niDTJ(GexgaqPqB
ztLAdf#wwQxjGitz)*vyyel#BWxvp~X8gn<d2k$Y1g{4-R&zqD9<`+BNf)>GqI_^Qw
zh7(t5WN#*ax^((bx_Mxs&yInGpijLZZUWn3G&3Dyvf)oQ%ACPkJ!l4}n598Wkuk-1
z7*02+__5BDh@1TG&91Yi>xxRt<K$)QR&|Lp7ttrmW&a2D*R!YiNGpBA|FWpDEr=e8
zkb}N{0G~#=B$y6F<9S|H@z{R<nzHr%DLa>vrEFvt3MXL~%8meD7dFs86s9N1kE@|h
zY5GO*W|9p;hl>D*jwOte%J~G7D^h!YsR^HamE#fa{JONy@2Hp>=yOl9ygHRvibsc_
z7U^z3(Ku6;VmS90pIfxxFYkJa)G?5R5J2gJVS-{^_t{k0;gK%?L~Uo`DU|YrvLMH+
zRu!PvZKlR#Q0nFH=gkjWC0?IMvQcSu@OrH7GF>!NT8N^63Fr$_O^yr{v*_Hh%t90)
zFF^sE-PZbRSiFyE!z(<T$Z?^L29#|zx3+$U;IK8CJQc-z{f>gWLF<pUSVPTgPQ8~=
zAwHVfC2BXw5PsQ_JS$aO#I@(Kceyp+X%1INkO4xlqX!9hIqAJic#l(Jg1!_^cgmRc
z{{L1uH;A%=uMj|C;xjov?Znc!cr|AF6@ZnVy9HNa_5rS~<HBYDp;}D!@Xo381}*KB
zu)*h-{&MF!nM~xj+2c8SEl>)@s>RV;O0qf3&SFgSqZXi<)9F5^n$c&7)KJ>RsO4sq
zDpy46!&s7G4qYn*gsO{iPiiWertl6L&j$~g5_DD;gcoyY_P<&<Haqk--kcyQi*DP>
z4UlQ}1v5%Spr7aYvs|3ZakKe9F&+T-eHT*wI(Ks09?o7yISIEWy(f`32x})^Ib=)q
z)hf3;HA<{c#-f3Y-ENQe{xK%vfP$Her1*XZX#PGbl0Zrp1eDn>W@`$C(Ti+kSZwrF
zHCKW{qoN;Q#nm)ndwk;d(!y>EV4Li{K32V2(A(DX``zwlZ^VQsXiBuBo*dHTz5JAP
p`G@5F9>V<+N&lwwrsPPCFEB-`w3DB716_fQa>W0(uV{}i^&hVx(MtdT

literal 1612
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
Hab(8t^DWtE

diff --git a/tests/typ/code/call-invalid.typ b/tests/typ/code/call-invalid.typ
index a2c43abcd..f5a5adc30 100644
--- a/tests/typ/code/call-invalid.typ
+++ b/tests/typ/code/call-invalid.typ
@@ -26,7 +26,6 @@
 // Error: 1-3 expected function, found string
 #x()
 
----
 // Error: 3:1 expected closing bracket
 #args[`a]`
 
diff --git a/tests/typ/code/call.typ b/tests/typ/code/call.typ
index dcf11806e..76953580f 100644
--- a/tests/typ/code/call.typ
+++ b/tests/typ/code/call.typ
@@ -57,10 +57,9 @@
 
 #let a = "a"
 
-#args[a] \
 #args(a) \
-#args(a, [b]) \
-#args(a)[b]
+#args[a] \
+#args(a, [b])
 
 // Template can be argument or body depending on whitespace.
 #if "template" == type[b] [Sure ]
diff --git a/tests/typ/code/dict.typ b/tests/typ/code/dict.typ
index 655a32992..b2fd3566f 100644
--- a/tests/typ/code/dict.typ
+++ b/tests/typ/code/dict.typ
@@ -17,4 +17,4 @@
 // Error: 3:5 expected comma
 // Error: 2:12-2:16 expected identifier
 // Error: 1:17-1:18 expected expression, found colon
-{(:1 b:[], true::)}
+{(:1 b:"", true::)}
diff --git a/tests/typ/library/basic.typ b/tests/typ/library/basic.typ
index dab0fc172..a6aa71afb 100644
--- a/tests/typ/library/basic.typ
+++ b/tests/typ/library/basic.typ
@@ -3,7 +3,7 @@
 
 ---
 #test(type("hi"), "string")
-#test(repr([Hi #rect[there]]), "[Hi [<node rect>]]")
+#test(repr((1, 2, false, )), "(1, 2, false)")
 
 ---
 // Check the output.
diff --git a/tools/support/typst.tmLanguage.json b/tools/support/typst.tmLanguage.json
index 48ef26b8b..c7fdcb52d 100644
--- a/tools/support/typst.tmLanguage.json
+++ b/tools/support/typst.tmLanguage.json
@@ -86,6 +86,7 @@
         },
         {
           "name": "punctuation.definition.list.numbered.typst",
+          "match": "^\\s*[0-9]*\\.\\s+"
         },
         {
           "name": "string.other.math.block.typst",
@@ -110,7 +111,6 @@
           "begin": "`",
           "end": "`",
           "captures": { "0": { "name": "punctuation.definition.raw.typst" } }
-          "match": "^\\s*[0-9]*\\.\\s+"
         },
         {
           "name": "keyword.control.typst",