From 9f9ba7ba5a6442853a735e4d3454fc664bae2e66 Mon Sep 17 00:00:00 2001 From: PgBiel <9021226+PgBiel@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:03:38 -0300 Subject: [PATCH] separate DecoratorMarker from Decorator --- crates/typst-syntax/src/highlight.rs | 4 ++-- crates/typst-syntax/src/kind.rs | 3 +++ crates/typst-syntax/src/lexer.rs | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/crates/typst-syntax/src/highlight.rs b/crates/typst-syntax/src/highlight.rs index 7128c3584..59cad25ea 100644 --- a/crates/typst-syntax/src/highlight.rs +++ b/crates/typst-syntax/src/highlight.rs @@ -286,8 +286,8 @@ pub fn highlight(node: &LinkedNode) -> Option { SyntaxKind::Destructuring => None, SyntaxKind::DestructAssignment => None, - // TODO - SyntaxKind::Decorator => Some(Tag::Comment), + SyntaxKind::DecoratorMarker => Some(Tag::Comment), + SyntaxKind::Decorator => None, SyntaxKind::LineComment => Some(Tag::Comment), SyntaxKind::BlockComment => Some(Tag::Comment), diff --git a/crates/typst-syntax/src/kind.rs b/crates/typst-syntax/src/kind.rs index 769cdd72d..b9ccf45c4 100644 --- a/crates/typst-syntax/src/kind.rs +++ b/crates/typst-syntax/src/kind.rs @@ -13,6 +13,8 @@ pub enum SyntaxKind { LineComment, /// A block comment: `/* ... */`. BlockComment, + /// A decorator's marker: `/!` + DecoratorMarker, /// The contents of a file or content block. Markup, @@ -374,6 +376,7 @@ impl SyntaxKind { Self::Error => "syntax error", Self::LineComment => "line comment", Self::BlockComment => "block comment", + Self::DecoratorMarker => "decorator marker", Self::Markup => "markup", Self::Text => "text", Self::Space => "space", diff --git a/crates/typst-syntax/src/lexer.rs b/crates/typst-syntax/src/lexer.rs index e08b4501b..05b125709 100644 --- a/crates/typst-syntax/src/lexer.rs +++ b/crates/typst-syntax/src/lexer.rs @@ -233,7 +233,7 @@ impl Lexer<'_> { // Already collected all we need from the decorator. self.s.jump(start + 2); - SyntaxKind::Decorator + SyntaxKind::DecoratorMarker } }