markdown and markdown inline

Cargo.toml

@@ -34,7 +34,8 @@ default = [
     "javascript",
     "json",
     "lua",
-    "markdown-tree-sitter-markdown",
+    "markdown",
+    "markdown-inline",
     "python",
     "rust",
     "toml",
@@ -56,7 +57,8 @@ java = []
 javascript = []
 json = []
 lua = []
-markdown-tree-sitter-markdown = []
+markdown = []
+markdown-inline = []
 python = []
 rust = []
 toml = []

build.rs

@@ -7,6 +7,27 @@ use std::{
     process::Command,
 };
 
+fn resolve_lang_src(base: &Path, prefix: Option<&str>, lang: String) -> (String, PathBuf) {
+    if let Some(prefix) = prefix {
+        let nested = base.join(format!("tree-sitter-{prefix}-{lang}"));
+        if nested.exists() {
+            return (format!("{prefix}_{lang}"), nested.join("src"));
+        }
+    }
+
+    let nested = base.join(format!("tree-sitter-{lang}"));
+    if nested.exists() {
+        return (lang, nested.join("src"));
+    }
+
+    let nested = base.join(&lang);
+    if nested.exists() {
+        return (lang, nested.join("src"));
+    }
+
+    (lang, base.join("src"))
+}
+
 #[derive(Debug)]
 struct Sitter {
     path: PathBuf,
@@ -20,21 +41,21 @@ impl Sitter {
         let sitter = match feature.split_once('-') {
             Some((dir, lang)) => {
                 let path = PathBuf::from(format!("sitters/tree-sitter-{dir}"));
-                let src = path.join(lang).join("src");
+                let (lang, src) = resolve_lang_src(&path, Some(dir), lang.to_owned());
 
                 Self {
-                    path,
                     src,
+                    path,
                     lang: lang.to_owned(),
                     version: OnceCell::new(),
                 }
             }
             None => {
-                let lang = feature;
-                let path = PathBuf::from(format!("sitters/tree-sitter-{lang}"));
+                let path = PathBuf::from(format!("sitters/tree-sitter-{feature}"));
+                let (lang, src) = resolve_lang_src(&path, None, feature);
 
                 Self {
-                    src: path.join("src"),
+                    src,
                     path,
                     lang,
                     version: OnceCell::new(),

src/lib.rs

@@ -23,6 +23,11 @@ pepegsit!(javascript, "javascript", "/lang_javascript.rs");
 pepegsit!(json, "json", "/lang_json.rs");
 pepegsit!(lua, "lua", "/lang_lua.rs");
 pepegsit!(markdown, "markdown", "/lang_markdown.rs");
+pepegsit!(
+    markdown_inline,
+    "markdown-inline",
+    "/lang_markdown_inline.rs"
+);
 pepegsit!(python, "python", "/lang_python.rs");
 pepegsit!(rust, "rust", "/lang_rust.rs");
 pepegsit!(toml, "toml", "/lang_toml.rs");