Merge pull request #302 from grantlemons/typst-support

feat: Typst Language Support

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = [ "harper-cli", "harper-core", "harper-ls", "harper-comments", "harper-wasm", "harper-tree-sitter", "harper-html", "harper-literate-haskell"]
+members = [ "harper-cli", "harper-core", "harper-ls", "harper-comments", "harper-wasm", "harper-tree-sitter", "harper-html", "harper-literate-haskell", "harper-typst" ]
 resolver = "2"
 
 [profile.release]

harper-cli/Cargo.toml

@@ -13,4 +13,8 @@ clap = { version = "4.5.23", features = ["derive"] }
 harper-literate-haskell = { path = "../harper-literate-haskell", version = "0.15.0" }
 harper-core = { path = "../harper-core", version = "0.15.0" }
 harper-comments = { path = "../harper-comments", version = "0.15.0" }
+harper-typst = { path = "../harper-typst", version = "0.15.0" }
 serde_json = "1.0.133"
+
+[features]
+default = []

harper-cli/src/main.rs

@@ -169,16 +169,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> =
+    let parser: Box<dyn harper_core::parsers::Parser> =
         match file.extension().map(|v| v.to_str().unwrap()) {
             Some("md") => Box::new(Markdown),
             Some("lhs") => Box::new(LiterateHaskellParser),
+            Some("typ") => Box::new(harper_typst::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/src/comment_parser.rs

@@ -99,7 +99,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;