Check for file-types of django

Default to django if it matches file-types of templates/**.html and have root
of manage.py, otherwise defaults to html.

Author: pickfire

Cargo.lock

@@ -29,6 +29,7 @@ tree-sitter = "0.20"
 once_cell = "1.13"
 arc-swap = "1"
 regex = "1"
+globset = "0.4.9"
 
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }

helix-core/Cargo.toml

@@ -2,12 +2,14 @@ use crate::{
     auto_pairs::AutoPairs,
     chars::char_is_line_ending,
     diagnostic::Severity,
+    find_root,
     regex::Regex,
     transaction::{ChangeSet, Operation},
     Rope, RopeSlice, Tendril,
 };
 
 use arc_swap::{ArcSwap, Guard};
+use globset::Glob;
 use slotmap::{DefaultKey as LayerId, HopSlotMap};
 
 use std::{
@@ -484,6 +486,25 @@ impl Loader {
                 path.extension()
                     .and_then(|extension| extension.to_str())
                     .and_then(|extension| self.language_config_ids_by_file_type.get(extension))
+            })
+            .or_else(|| {
+                // find by glob using config.file_type and roots
+                self.language_config_ids_by_file_type
+                    .iter()
+                    .find_map(|(file_type, id)| {
+                        let glob = Glob::new(file_type).unwrap().compile_matcher();
+                        if glob.is_match(path) {
+                            let config = self.language_configs[*id].as_ref();
+                            let root_path = find_root(None, &config.roots);
+                            if root_path.is_some() {
+                                Some(id)
+                            } else {
+                                None
+                            }
+                        } else {
+                            None
+                        }
+                    })
             });
 
         configuration_id.and_then(|&id| self.language_configs.get(id).cloned())

helix-core/src/syntax.rs

@@ -408,11 +408,23 @@ indent = { tab-width = 2, unit = "  " }
 name = "scss"
 source = { git = "https://github.com/serenadeai/tree-sitter-scss", rev = "c478c6868648eff49eb04a4df90d703dc45b312a" }
 
+[[language]]
+name = "htmldjango"
+scope = "source.htmldjango"
+injection-regex = "htmldjango"
+file-types = ["**/templates/**.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 = "html"
 scope = "text.html.basic"
 injection-regex = "html"
-file-types = ["html"]
+file-types = ["*.html"]
 roots = []
 language-server = { command = "vscode-html-language-server", args = ["--stdio"] }
 auto-format = true
@@ -423,18 +435,6 @@ 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"