From 33585d9a3fbab8a76d3fd8e9c2560f929202a518 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Mon, 23 Jan 2023 16:01:15 +0100
Subject: [PATCH] Small fixes

---
 Cargo.lock                 | 1 +
 Cargo.toml                 | 1 +
 library/src/math/matrix.rs | 2 +-
 library/src/math/mod.rs    | 1 +
 library/src/math/root.rs   | 2 +-
 src/ide/highlight.rs       | 7 +++++++
 src/syntax/lexer.rs        | 1 +
 7 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0234d4b42..69b01b2ff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1094,6 +1094,7 @@ dependencies = [
  "flate2",
  "if_chain",
  "image",
+ "log",
  "miniz_oxide 0.5.4",
  "once_cell",
  "pdf-writer",
diff --git a/Cargo.toml b/Cargo.toml
index c18aa3b63..ac16e1bad 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,6 +19,7 @@ comemo = { git = "https://github.com/typst/comemo" }
 flate2 = "1"
 if_chain = "1"
 image = { version = "0.24", default-features = false, features = ["png", "jpeg", "gif"] }
+log = "0.4"
 miniz_oxide = "0.5"
 once_cell = "1"
 pdf-writer = "0.6"
diff --git a/library/src/math/matrix.rs b/library/src/math/matrix.rs
index 9472e9895..27e1b282c 100644
--- a/library/src/math/matrix.rs
+++ b/library/src/math/matrix.rs
@@ -31,7 +31,7 @@ impl VecNode {
     ///
     /// # Example
     /// ```
-    /// #set vec(delim: "[")
+    /// #set math.vec(delim: "[")
     /// $ vec(1, 2) $
     /// ```
     pub const DELIM: Delimiter = Delimiter::Paren;
diff --git a/library/src/math/mod.rs b/library/src/math/mod.rs
index 0de440be9..45e33daf9 100644
--- a/library/src/math/mod.rs
+++ b/library/src/math/mod.rs
@@ -56,6 +56,7 @@ pub fn module() -> Module {
     math.def_func::<FloorFunc>("floor");
     math.def_func::<CeilFunc>("ceil");
     math.def_func::<AbsFunc>("abs");
+    math.def_func::<NormFunc>("norm");
     math.def_func::<AccentNode>("accent");
     math.def_func::<FracNode>("frac");
     math.def_func::<BinomNode>("binom");
diff --git a/library/src/math/root.rs b/library/src/math/root.rs
index 2efe4e078..105730668 100644
--- a/library/src/math/root.rs
+++ b/library/src/math/root.rs
@@ -37,7 +37,7 @@ impl LayoutMath for SqrtNode {
 ///
 /// ## Example
 /// ```
-/// $ radical(3, x) $
+/// $ root(3, x) $
 /// ```
 ///
 /// ## Parameters
diff --git a/src/ide/highlight.rs b/src/ide/highlight.rs
index 5f615d041..75201d93e 100644
--- a/src/ide/highlight.rs
+++ b/src/ide/highlight.rs
@@ -191,6 +191,13 @@ pub fn highlight(node: &LinkedNode) -> Option<Category> {
                 | SyntaxKind::Frac,
             ) => Some(Category::Interpolated),
             Some(SyntaxKind::FuncCall) => Some(Category::Function),
+            Some(SyntaxKind::FieldAccess)
+                if node.parent().and_then(|p| p.parent_kind())
+                    == Some(SyntaxKind::SetRule)
+                    && node.next_sibling().is_none() =>
+            {
+                Some(Category::Function)
+            }
             Some(SyntaxKind::FieldAccess)
                 if node
                     .parent()
diff --git a/src/syntax/lexer.rs b/src/syntax/lexer.rs
index 433d0defc..1064939de 100644
--- a/src/syntax/lexer.rs
+++ b/src/syntax/lexer.rs
@@ -429,6 +429,7 @@ impl Lexer<'_> {
             '-' if self.s.eat_if('>') => SyntaxKind::Shorthand,
             '=' if self.s.eat_if('>') => SyntaxKind::Shorthand,
             ':' if self.s.eat_if('=') => SyntaxKind::Shorthand,
+            '.' if self.s.eat_if("..") => SyntaxKind::Shorthand,
 
             '_' => SyntaxKind::Underscore,
             '$' => SyntaxKind::Dollar,