Add tree-sitter-htmldjango

book/src/generated/lang-support.md

@@ -45,6 +45,7 @@
 | hcl | ✓ |  | ✓ | `terraform-ls` |
 | heex | ✓ | ✓ |  |  |
 | html | ✓ |  |  | `vscode-html-language-server` |
+| htmldjango | ✓ |  | ✓ |  |
 | idris |  |  |  | `idris2-lsp` |
 | iex | ✓ |  |  |  |
 | java | ✓ |  |  | `jdtls` |

helix-core/src/syntax.rs

@@ -436,8 +436,8 @@ impl LanguageConfiguration {
 pub struct Loader {
     // highlight_names ?
     language_configs: Vec<Arc<LanguageConfiguration>>,
-    language_config_ids_by_file_type: HashMap<String, usize>, // Vec<usize>
-    language_config_ids_by_shebang: HashMap<String, usize>,
+    language_config_ids_by_file_type: HashMap<String, Vec<usize>>, // Vec<usize>
+    language_config_ids_by_shebang: HashMap<String, Vec<usize>>,
 
     scopes: ArcSwap<Vec<String>>,
 }
@@ -456,15 +456,18 @@ impl Loader {
             let language_id = loader.language_configs.len();
 
             for file_type in &config.file_types {
-                // entry().or_insert(Vec::new).push(language_id);
                 loader
                     .language_config_ids_by_file_type
-                    .insert(file_type.clone(), language_id);
+                    .entry(file_type.clone())
+                    .or_insert_with(Vec::new)
+                    .push(language_id);
             }
             for shebang in &config.shebangs {
                 loader
                     .language_config_ids_by_shebang
-                    .insert(shebang.clone(), language_id);
+                    .entry(shebang.clone())
+                    .or_insert_with(Vec::new)
+                    .push(language_id);
             }
 
             loader.language_configs.push(Arc::new(config));
@@ -476,7 +479,7 @@ impl Loader {
     pub fn language_config_for_file_name(&self, path: &Path) -> Option<Arc<LanguageConfiguration>> {
         // Find all the language configurations that match this file name
         // or a suffix of the file name.
-        let configuration_id = path
+        let configuration_ids = path
             .file_name()
             .and_then(|n| n.to_str())
             .and_then(|file_name| self.language_config_ids_by_file_type.get(file_name))
@@ -485,6 +488,35 @@ impl Loader {
                     .and_then(|extension| extension.to_str())
                     .and_then(|extension| self.language_config_ids_by_file_type.get(extension))
             });
+        // If there are more than one match, try to see if any of the roots
+        // matches to reduce the results.
+        let configuration_id = match configuration_ids.as_ref() {
+            Some(ids) => match &ids[..] {
+                [id] => Some(id),
+                ids => ids
+                    .iter()
+                    // prioritize language configs with root
+                    .find(|&id| {
+                        let roots = &self.language_configs[*id].roots;
+                        if roots.is_empty() {
+                            return false;
+                        }
+                        // check if specified roots is in search root path
+                        let root = helix_loader::search_root(path.to_str());
+                        for ancestor in root.ancestors() {
+                            if roots.iter().any(|marker| ancestor.join(marker).exists()) {
+                                return true;
+                            // but don't go higher than repo
+                            } else if ancestor.join(".git").is_dir() {
+                                return false;
+                            }
+                        }
+                        false
+                    })
+                    .or_else(|| ids.first()),
+            },
+            None => None,
+        };
 
         configuration_id.and_then(|&id| self.language_configs.get(id).cloned())
 
@@ -496,9 +528,11 @@ impl Loader {
         static SHEBANG_REGEX: Lazy<Regex> = Lazy::new(|| {
             Regex::new(r"^#!\s*(?:\S*[/\\](?:env\s+(?:\-\S+\s+)*)?)?([^\s\.\d]+)").unwrap()
         });
-        let configuration_id = SHEBANG_REGEX
-            .captures(&line)
-            .and_then(|cap| self.language_config_ids_by_shebang.get(&cap[1]));
+        let configuration_id = SHEBANG_REGEX.captures(&line).and_then(|cap| {
+            self.language_config_ids_by_shebang
+                .get(&cap[1])
+                .map(|ids| ids.first().unwrap())
+        });
 
         configuration_id.and_then(|&id| self.language_configs.get(id).cloned())
     }

helix-loader/src/lib.rs

@@ -2,7 +2,7 @@ pub mod config;
 pub mod grammar;
 
 use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 pub static RUNTIME_DIR: once_cell::sync::Lazy<PathBuf> = once_cell::sync::Lazy::new(runtime_dir);
 
@@ -88,21 +88,25 @@ pub fn log_file() -> PathBuf {
     cache_dir().join("helix.log")
 }
 
-pub fn find_root_impl(root: Option<&str>, root_markers: &[String]) -> Vec<PathBuf> {
-    let current_dir = std::env::current_dir().expect("unable to determine current directory");
-    let mut directories = Vec::new();
-
-    let root = match root {
+/// Get root to search until.
+pub fn search_root(root: Option<&str>) -> PathBuf {
+    let current_dir = || std::env::current_dir().expect("unable to determine current directory");
+    match root {
         Some(root) => {
-            let root = std::path::Path::new(root);
+            let root = Path::new(root);
             if root.is_absolute() {
                 root.to_path_buf()
             } else {
-                current_dir.join(root)
+                current_dir().join(root)
             }
         }
-        None => current_dir,
-    };
+        None => current_dir(),
+    }
+}
+
+pub fn find_root_impl(root: Option<&str>, root_markers: &[String]) -> Vec<PathBuf> {
+    let root = search_root(root);
+    let mut directories = Vec::new();
 
     for ancestor in root.ancestors() {
         // don't go higher than repo

languages.toml

@@ -423,6 +423,18 @@ indent = { tab-width = 2, unit = "  " }
 name = "html"
 source = { git = "https://github.com/tree-sitter/tree-sitter-html", rev = "d93af487cc75120c89257195e6be46c999c6ba18" }
 
+[[language]]
+name = "htmldjango"
+scope = "source.htmldjango"
+injection-regex = "htmldjango"
+file-types = ["html"]
+roots = ["manage.py"]
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "htmldjango"
+source = { git = "https://github.com/interdependence/tree-sitter-htmldjango", rev = "184a50456186c2ff49b9b410f7060a176e2a3080" }
+
 [[language]]
 name = "python"
 scope = "source.python"

runtime/queries/htmldjango/highlights.scm

@@ -0,0 +1,25 @@
+[
+  (unpaired_comment)
+  (paired_comment)
+] @comment
+
+[
+  "{{"
+  "}}"
+  "{%"
+  "%}"
+  (end_paired_statement)
+] @tag
+
+"end" @keyword.return
+
+(variable_name) @variable
+(filter_name) @function.macro
+(filter_argument) @variable.parameter
+(tag_name) @function
+(keyword) @keyword
+(operator) @operator
+(keyword_operator) @keyword.directive
+(number) @constant.numeric
+(boolean) @constant.builtin.boolean
+(string) @string

runtime/queries/htmldjango/indents.scm

@@ -0,0 +1,2 @@
+(paired_statement) @indent
+(end_paired_statement) @outdent

runtime/queries/htmldjango/injections.scm

@@ -0,0 +1,6 @@
+((content) @injection.content
+ (#set! injection.language "html")
+ (#set! injection.combined))
+
+([(unpaired_comment) (paired_comment)] @injection.content
+ (#set! injection.language "comment"))

runtime/themes/monokai_pro_spectrum.toml

@@ -56,10 +56,12 @@
 # operator, tags, units, punctuations
 "operator" = "red"
 "variable.other.member" = "base8"
+"tag" = "yellow"
 
 # keywords, special
 "keyword" = { fg = "red" }
 "keyword.directive" = "blue"
+"keyword.function" = "blue"
 "variable.parameter" = "#f59762"
 
 # error