feat: Typst Language Support

harper-cli/Cargo.toml

@@ -13,3 +13,7 @@ clap = { version = "4.5.23", features = ["derive"] }
 harper-core = { path = "../harper-core", version = "0.14.0" }
 harper-comments = { path = "../harper-comments", version = "0.14.0" }
 serde_json = "1.0.133"
+
+[features]
+default = ["typst"]
+typst = ["harper-core/typst"]

harper-cli/src/main.rs

@@ -142,16 +142,17 @@ fn main() -> anyhow::Result<()> {
 fn load_file(file: &Path) -> anyhow::Result<(Document, String)> {
     let source = std::fs::read_to_string(file)?;
 
-    let mut parser: Box<dyn harper_core::parsers::Parser> =
-        if let Some("md") = file.extension().map(|v| v.to_str().unwrap()) {
-            Box::new(Markdown)
-        } else {
-            Box::new(
+    let parser: Box<dyn harper_core::parsers::Parser> =
+        match file.extension().map(|v| v.to_str().unwrap()) {
+            Some("md") => Box::new(Markdown),
+            #[cfg(feature = "typst")]
+            Some("typ") => Box::new(harper_core::parsers::Typst),
+            _ => Box::new(
                 CommentParser::new_from_filename(file)
                     .map(Box::new)
                     .ok_or(format_err!("Could not detect language ID."))?,
-            )
+            ),
         };
 
-    Ok((Document::new_curated(&source, &mut parser), source))
+    Ok((Document::new_curated(&source, &parser), source))
 }

harper-comments/Cargo.toml

@@ -32,3 +32,6 @@ tree-sitter-haskell = "0.15.0"
 
 [dev-dependencies]
 paste = "1.0.15"
+
+[features]
+typst = ["harper-core/typst"]

harper-comments/src/comment_parser.rs

@@ -97,7 +97,7 @@ impl CommentParser {
 }
 
 impl Parser for CommentParser {
-    fn parse(&mut self, source: &[char]) -> Vec<Token> {
+    fn parse(&self, source: &[char]) -> Vec<Token> {
         self.inner.parse(source)
     }
 }

harper-comments/src/comment_parsers/go.rs

@@ -7,7 +7,7 @@ use super::without_initiators;
 pub struct Go;
 
 impl Parser for Go {
-    fn parse(&mut self, source: &[char]) -> Vec<Token> {
+    fn parse(&self, source: &[char]) -> Vec<Token> {
         let mut actual = without_initiators(source);
         let mut actual_source = actual.get_content(source);
 
@@ -25,9 +25,7 @@ impl Parser for Go {
             actual_source = new_source
         }
 
-        let mut markdown_parser = Markdown;
-
-        let mut new_tokens = markdown_parser.parse(actual_source);
+        let mut new_tokens = Markdown.parse(actual_source);
 
         new_tokens
             .iter_mut()

harper-comments/src/comment_parsers/javadoc.rs

@@ -12,7 +12,7 @@ pub struct JavaDoc {
 }
 
 impl Parser for JavaDoc {
-    fn parse(&mut self, source: &[char]) -> Vec<Token> {
+    fn parse(&self, source: &[char]) -> Vec<Token> {
         let actual = without_initiators(source);
         let actual_source = actual.get_content(source);
 

harper-comments/src/comment_parsers/jsdoc.rs

@@ -7,7 +7,7 @@ use super::without_initiators;
 pub struct JsDoc;
 
 impl Parser for JsDoc {
-    fn parse(&mut self, source: &[char]) -> Vec<Token> {
+    fn parse(&self, source: &[char]) -> Vec<Token> {
         let mut tokens = Vec::new();
 
         let mut chars_traversed = 0;

harper-comments/src/comment_parsers/unit.rs

@@ -12,7 +12,7 @@ use super::without_initiators;
 pub struct Unit;
 
 impl Parser for Unit {
-    fn parse(&mut self, source: &[char]) -> Vec<Token> {
+    fn parse(&self, source: &[char]) -> Vec<Token> {
         let mut tokens = Vec::new();
 
         let mut chars_traversed = 0;
@@ -57,10 +57,7 @@ fn parse_line(source: &[char]) -> Vec<Token> {
     }
 
     let source = actual.get_content(source);
-
-    let mut markdown_parser = Markdown;
-
-    let mut new_tokens = markdown_parser.parse(source);
+    let mut new_tokens = Markdown.parse(source);
 
     new_tokens
         .iter_mut()