typst · PgBiel · Jun 4, 2024 · Jun 5, 2024 · Jun 11, 2024 · Jun 12, 2024
diff --git a/crates/typst-syntax/src/ast.rs b/crates/typst-syntax/src/ast.rs
@@ -80,6 80,68 @@ impl<'a> Markup<'a> {
  }
 }
 
 node! {
  AnnotationName
 }
 
 impl<'a> AnnotationName<'a> {
  /// Get the annotation name.
  pub fn get(self) -> &'a EcoString {
  self.0.text()
  }
 
  /// Get the annotation name as a string slice.
  pub fn as_str(self) -> &'a str {
  self.get()
  }
 }
 
 node! {
  /// An annotation: `// @allow("warning")`.
  Annotation
 }
 
 impl<'a> Annotation<'a> {
  /// The name of the annotation, e.g. `allow`.
  pub fn name(self) -> AnnotationName<'a> {
  self.0.cast_first_match().unwrap_or_default()
  }
 
  /// The annotation's arguments, which are always either identifiers or
  /// strings.
  pub fn arguments(self) -> impl DoubleEndedIterator<Item = AnnotationArg<'a>> {
  self.0.children().filter_map(AnnotationArg::from_untyped)
  }
 }
 
 /// An annotation argument, which always corresponds to a simple string, which,
 /// however, may be abbreviated and specified as a valid identifier directly.
 pub enum AnnotationArg<'a> {
  /// An identifier specified directly, without quotes.
  Ident(Ident<'a>),
  /// A string specified with double quotes.
  Str(Str<'a>),
 }
 
 impl<'a> AnnotationArg<'a> {
  /// Casts an untyped node to an annotation argument, if possible.
  pub fn from_untyped(node: &'a SyntaxNode) -> Option<Self> {
  match node.kind() {
  SyntaxKind::Ident => node.cast().map(Self::Ident),
  SyntaxKind::Str => node.cast().map(Self::Str),
  _ => Option::None,
  }
  }
 
  /// Gets the text specified for this argument.
  pub fn get(self) -> EcoString {
  match self {
  Self::Ident(ident) => ident.get().clone(),
  Self::Str(str) => str.get(),
  }
  }
 }
 
 /// An expression in markup, math or code.
 #[derive(Debug, Copy, Clone, Hash)]
 pub enum Expr<'a> {

diff --git a/crates/typst-syntax/src/highlight.rs b/crates/typst-syntax/src/highlight.rs
@@ -286,6 286,10 @@ pub fn highlight(node: &LinkedNode) -> Option<Tag> {
  SyntaxKind::Destructuring => None,
  SyntaxKind::DestructAssignment => None,
 
  SyntaxKind::Annotation => None,
  SyntaxKind::AnnotationMarker => None,
  SyntaxKind::AnnotationName => None,
 
  SyntaxKind::LineComment => Some(Tag::Comment),
  SyntaxKind::BlockComment => Some(Tag::Comment),
  SyntaxKind::Error => Some(Tag::Error),

diff --git 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,
  /// An annotation: `// @allow("warning")`.
  Annotation,
 
  /// The contents of a file or content block.
  Markup,
@@ -278,6 280,11 @@ pub enum SyntaxKind {
  Destructuring,
  /// A destructuring assignment expression: `(x, y) = (1, 2)`.
  DestructAssignment,
 
  /// An annotation's marker: `// @`.
  AnnotationMarker,
  /// An annotation's name: `allow`.
  AnnotationName,
 }
 
 impl SyntaxKind {
@@ -355,7 362,11 @@ impl SyntaxKind {
  pub fn is_trivia(self) -> bool {
  matches!(
  self,
- Self::LineComment | Self::BlockComment | Self::Space | Self::Parbreak
  Self::LineComment
  | Self::BlockComment
  | Self::Space
  | Self::Parbreak
  | Self::Annotation
  )
  }
 
@@ -371,6 382,7 @@ impl SyntaxKind {
  Self::Error => "syntax error",
  Self::LineComment => "line comment",
  Self::BlockComment => "block comment",
  Self::Annotation => "annotation",
  Self::Markup => "markup",
  Self::Text => "text",
  Self::Space => "space",
@@ -498,6 510,8 @@ impl SyntaxKind {
  Self::FuncReturn => "`return` expression",
  Self::Destructuring => "destructuring pattern",
  Self::DestructAssignment => "destructuring assignment expression",
  Self::AnnotationMarker => "annotation marker",
  Self::AnnotationName => "annotation name",
  }
  }
 }