From f26526ba75582f24d2bae18a43de3f6622c588ec Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Mon, 7 Jun 2021 18:06:27 +0200
Subject: [PATCH] Switch back to hashtags for headings

---
 src/parse/mod.rs                    |   6 +++---
 src/parse/tokens.rs                 |  13 ++++++++-----
 src/pretty.rs                       |   4 ++--
 src/syntax/token.rs                 |   7 +++++--
 tests/ref/code/call-invalid.png     | Bin 2897 -> 2834 bytes
 tests/ref/markup/heading.png        | Bin 5162 -> 5301 bytes
 tests/typ/code/call-invalid.typ     |   4 ----
 tests/typ/code/importable/chap1.typ |   2 +-
 tests/typ/code/importable/chap2.typ |   2 +-
 tests/typ/code/include.typ          |   2 +-
 tests/typ/full/coma.typ             |   2 +-
 tests/typ/markup/heading.typ        |  26 +++++++++++++-------------
 tools/support/typst.tmLanguage.json |   6 +++---
 13 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index 5bda818fd..4c935579f 100644
--- a/src/parse/mod.rs
+++ b/src/parse/mod.rs
@@ -61,7 +61,7 @@ fn node(p: &mut Parser, at_start: &mut bool) -> Option<Node> {
         // Markup.
         Token::Star => Node::Strong(span),
         Token::Underscore => Node::Emph(span),
-        Token::Eq => {
+        Token::Hashtag => {
             if *at_start {
                 return Some(heading(p));
             } else {
@@ -128,11 +128,11 @@ fn node(p: &mut Parser, at_start: &mut bool) -> Option<Node> {
 /// Parse a heading.
 fn heading(p: &mut Parser) -> Node {
     let start = p.start();
-    p.assert(Token::Eq);
+    p.assert(Token::Hashtag);
 
     // Count depth.
     let mut level: usize = 1;
-    while p.eat_if(Token::Eq) {
+    while p.eat_if(Token::Hashtag) {
         level += 1;
     }
 
diff --git a/src/parse/tokens.rs b/src/parse/tokens.rs
index 62d2e68e4..fa86d2f19 100644
--- a/src/parse/tokens.rs
+++ b/src/parse/tokens.rs
@@ -73,7 +73,7 @@ impl<'s> Iterator for Tokens<'s> {
                 '{' => Token::LeftBrace,
                 '}' => Token::RightBrace,
 
-                // Keywords, variables, functions, colors.
+                // Headings, keywords, identifiers, colors.
                 '#' => self.hash(start),
 
                 // Whitespace.
@@ -93,7 +93,6 @@ impl<'s> Iterator for Tokens<'s> {
                 // Markup.
                 '*' => Token::Star,
                 '_' => Token::Underscore,
-                '=' => Token::Eq,
                 '~' => Token::Tilde,
                 '`' => self.raw(),
                 '$' => self.math(),
@@ -157,6 +156,10 @@ impl<'s> Tokens<'s> {
 
         match self.mode {
             TokenMode::Markup => {
+                if read.is_empty() {
+                    return Token::Hashtag;
+                }
+
                 if let Some(token) = keyword(read) {
                     return token;
                 }
@@ -607,8 +610,8 @@ mod tests {
         // Test markup tokens.
         t!(Markup[" a1"]: "*"  => Star);
         t!(Markup: "_"         => Underscore);
-        t!(Markup[""]: "==="   => Eq, Eq, Eq);
-        t!(Markup["a1/"]: "= " => Eq, Space(0));
+        t!(Markup[""]: "###"   => Hashtag, Hashtag, Hashtag);
+        t!(Markup["a1/"]: "# " => Hashtag, Space(0));
         t!(Markup: "~"         => Tilde);
         t!(Markup[" "]: r"\"   => Backslash);
     }
@@ -666,7 +669,7 @@ mod tests {
         for &(s, t) in &keywords {
             t!(Markup[" "]: format!("#{}", s) => t);
             t!(Markup[" "]: format!("#{0}#{0}", s) => t, t);
-            t!(Markup[" /"]: format!("# {}", s) => Token::Invalid("#"), Space(0), Text(s));
+            t!(Markup[" /"]: format!("# {}", s) => Token::Hashtag, Space(0), Text(s));
         }
 
         for &(s, t) in &keywords {
diff --git a/src/pretty.rs b/src/pretty.rs
index 397bbc38c..49f6fd825 100644
--- a/src/pretty.rs
+++ b/src/pretty.rs
@@ -141,7 +141,7 @@ impl PrettyWithMap for Node {
 impl PrettyWithMap for HeadingNode {
     fn pretty_with_map(&self, p: &mut Printer, map: Option<&NodeMap>) {
         for _ in 0 .. self.level {
-            p.push('=');
+            p.push('#');
         }
         self.contents.pretty_with_map(p, map);
     }
@@ -666,7 +666,7 @@ mod tests {
         roundtrip("hi");
 
         // Heading.
-        roundtrip("= *Ok*");
+        roundtrip("# *Ok*");
 
         // Raw.
         roundtrip("``");
diff --git a/src/syntax/token.rs b/src/syntax/token.rs
index 3484536d6..538d81b7f 100644
--- a/src/syntax/token.rs
+++ b/src/syntax/token.rs
@@ -20,8 +20,8 @@ pub enum Token<'s> {
     Star,
     /// An underscore: `_`.
     Underscore,
-    /// A single equals sign: `=`.
-    Eq,
+    /// A single hashtag: `#`.
+    Hashtag,
     /// A tilde: `~`.
     Tilde,
     /// A backslash followed by nothing or whitespace: `\`.
@@ -38,6 +38,8 @@ pub enum Token<'s> {
     Hyph,
     /// A slash: `/`.
     Slash,
+    /// A single equals sign: `=`.
+    Eq,
     /// Two equals signs: `==`.
     EqEq,
     /// An exclamation mark followed by an equals sign: `!=`.
@@ -200,6 +202,7 @@ impl<'s> Token<'s> {
             Self::RightParen => "closing paren",
             Self::Star => "star",
             Self::Underscore => "underscore",
+            Self::Hashtag => "hashtag",
             Self::Tilde => "tilde",
             Self::Backslash => "backslash",
             Self::Comma => "comma",
diff --git a/tests/ref/code/call-invalid.png b/tests/ref/code/call-invalid.png
index f2f90f095b961360c1979133e308227528a5a87a..e024e6ced404e19081016ded0d7ba21f5c139096 100644
GIT binary patch
literal 2834
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

literal 2897
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
L)>17--NXGClD7F4

diff --git a/tests/ref/markup/heading.png b/tests/ref/markup/heading.png
index 46b5b637b57edbb455f2c195a48c7c4e29d177ed..825b40076bfd47deea779c3eb7b5d020326949f4 100644
GIT binary patch
literal 5301
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
D*xjK4

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

diff --git a/tests/typ/code/call-invalid.typ b/tests/typ/code/call-invalid.typ
index 0ed5246ff..a2c43abcd 100644
--- a/tests/typ/code/call-invalid.typ
+++ b/tests/typ/code/call-invalid.typ
@@ -1,9 +1,5 @@
 // Test invalid function calls.
 
----
-// Error: 1-2 unexpected invalid token
-#
-
 ---
 // Error: 7-8 expected expression, found colon
 #args(:)
diff --git a/tests/typ/code/importable/chap1.typ b/tests/typ/code/importable/chap1.typ
index 06a4c1a1a..a0f38d0d6 100644
--- a/tests/typ/code/importable/chap1.typ
+++ b/tests/typ/code/importable/chap1.typ
@@ -2,7 +2,7 @@
 
 #let name = "Klaus"
 
-== Chapter 1
+## Chapter 1
 #name stood in a field of wheat. There was nothing of particular interest about
 the field #name just casually surveyed for any paths on which the corn would not
 totally ruin his semi-new outdorsy jacket but then again, most of us spend
diff --git a/tests/typ/code/importable/chap2.typ b/tests/typ/code/importable/chap2.typ
index d4aedc60d..51e116aa8 100644
--- a/tests/typ/code/importable/chap2.typ
+++ b/tests/typ/code/importable/chap2.typ
@@ -2,7 +2,7 @@
 
 #let name = "Klaus"
 
-== Chapter 2
+## Chapter 2
 Their motivations, however, were pretty descript, so to speak. #name had not yet
 conceptualized their consequences, but that should change pretty quickly. #name
 approached the center of the field and picked up a 4-foot long disk made from
diff --git a/tests/typ/code/include.typ b/tests/typ/code/include.typ
index 9fd028f98..945a041d3 100644
--- a/tests/typ/code/include.typ
+++ b/tests/typ/code/include.typ
@@ -1,7 +1,7 @@
 // Test include statements.
 
 ---
-= Document
+# Document
 
 // Include a file
 #include "importable/chap1.typ"
diff --git a/tests/typ/full/coma.typ b/tests/typ/full/coma.typ
index 4941fb714..78a703a95 100644
--- a/tests/typ/full/coma.typ
+++ b/tests/typ/full/coma.typ
@@ -30,7 +30,7 @@
 // the parentheses.
 #align(center)[
     // Markdown-like syntax for headings.
-    ==== 3. Übungsblatt Computerorientierte Mathematik II #v(4mm)
+    #### 3. Übungsblatt Computerorientierte Mathematik II #v(4mm)
     *Abgabe: 03.05.2019* (bis 10:10 Uhr in MA 001) #v(4mm)
     *Alle Antworten sind zu beweisen.*
 ]
diff --git a/tests/typ/markup/heading.typ b/tests/typ/markup/heading.typ
index 9bbe34151..56f48bae2 100644
--- a/tests/typ/markup/heading.typ
+++ b/tests/typ/markup/heading.typ
@@ -4,44 +4,44 @@
 // Different number of hashtags.
 
 // Valid levels.
-=1
-===2
-======6
+# 1
+### 2
+###### 6
 
 // Too many hashtags.
 // Warning: 1-8 should not exceed depth 6
-=======7
+####### 7
 
 ---
 // Heading continuation over linebreak.
 
 // Code blocks continue heading.
-= A{
+# A{
     "B"
 }
 
 // Function call continues heading.
-= #rect[
+# #rect[
     A
 ] B
 
 // Without some kind of block, headings end at a line break.
-= A
+# A
 B
 
 ---
 // Heading vs. no heading.
 
 // Parsed as headings if at start of the context.
-/**/ = Ok
-{[== Ok]}
-#rect[=== Ok]
+/**/ # Ok
+{[## Ok]}
+#rect[### Ok]
 
 // Not at the start of the context.
-No = heading
+No # heading
 
 // Escaped.
-\= No heading
+\# No heading
 
 ---
 // Make small, but double heading.
@@ -49,4 +49,4 @@ No = heading
 
 // The new heading's argument list doesn't contain `level`.
 // Error: 1-11 unexpected argument
-=== Twice.
+### Twice.
diff --git a/tools/support/typst.tmLanguage.json b/tools/support/typst.tmLanguage.json
index 3375a07df..48ef26b8b 100644
--- a/tools/support/typst.tmLanguage.json
+++ b/tools/support/typst.tmLanguage.json
@@ -75,18 +75,17 @@
         {
           "name": "markup.heading.typst",
           "contentName": "entity.name.section.typst",
-          "begin": "^\\s*={1,6}",
+          "begin": "^\\s*#{1,6}\\s+",
           "end": "\n",
           "beginCaptures": { "0": { "name": "punctuation.definition.heading.typst" } },
           "patterns": [{ "include": "#markup" }]
         },
         {
           "name": "punctuation.definition.list.unnumbered.typst",
-          "match": "^\\s*-"
+          "match": "^\\s*-\\s+"
         },
         {
           "name": "punctuation.definition.list.numbered.typst",
-          "match": "^\\s*[0-9]*\\."
         },
         {
           "name": "string.other.math.block.typst",
@@ -111,6 +110,7 @@
           "begin": "`",
           "end": "`",
           "captures": { "0": { "name": "punctuation.definition.raw.typst" } }
+          "match": "^\\s*[0-9]*\\.\\s+"
         },
         {
           "name": "keyword.control.typst",