feat: add htmldjango

7 files changed, 57 insertions, 0 deletions

diff --git a/README.md b/README.md
index e8c3f64bc..897e7fa69 100644
--- a/README.md
+++ b/README.md
@@ -232,6 +232,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [hlsl](https://github.com/theHamsta/tree-sitter-hlsl) (maintained by @theHamsta)
 - [x] [hocon](https://github.com/antosha417/tree-sitter-hocon) (maintained by @antosha417)
 - [x] [html](https://github.com/tree-sitter/tree-sitter-html) (maintained by @TravonteD)
+- [x] [htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) (experimental, maintained by @ObserverOfTime)
 - [x] [http](https://github.com/rest-nvim/tree-sitter-http) (maintained by @NTBBloodbath)
 - [x] [java](https://github.com/tree-sitter/tree-sitter-java) (maintained by @p00f)
 - [x] [javascript](https://github.com/tree-sitter/tree-sitter-javascript) (maintained by @steelsojka)
diff --git a/lockfile.json b/lockfile.json
index 9ab60cc11..a1205d397 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -179,6 +179,9 @@
   "html": {
     "revision": "29f53d8f4f2335e61bf6418ab8958dac3282077a"
   },
+  "htmldjango": {
+    "revision": "b2dba02eddab66be669022320273d0dfe1ff923d"
+  },
   "http": {
     "revision": "2c6c44574031263326cb1e51658bbc0c084326e7"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 91a48b96f..39d989e0b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1416,6 +1416,16 @@ list.ebnf = {
   experimental = true,
 }
 
+list.htmldjango = {
+  install_info = {
+    url = "https://github.com/interdependence/tree-sitter-htmldjango",
+    files = { "src/parser.c" },
+    branch = "main",
+  },
+  maintainers = { "@ObserverOfTime" },
+  experimental = true,
+}
+
 list.ini = {
   install_info = {
     url = "https://github.com/justinmk/tree-sitter-ini",
diff --git a/queries/htmldjango/folds.scm b/queries/htmldjango/folds.scm
new file mode 100644
index 000000000..5e8f17c78
--- /dev/null
+++ b/queries/htmldjango/folds.scm
@@ -0,0 +1,4 @@
+[
+  (paired_statement)
+  (paired_comment)
+] @fold
diff --git a/queries/htmldjango/highlights.scm b/queries/htmldjango/highlights.scm
new file mode 100644
index 000000000..848b455dd
--- /dev/null
+++ b/queries/htmldjango/highlights.scm
@@ -0,0 +1,35 @@
+; adapted from https://github.com/interdependence/tree-sitter-htmldjango
+
+[
+  (unpaired_comment)
+  (paired_comment)
+] @comment @spell
+
+[
+  "{{" "}}"
+  "{%" "%}"
+  (end_paired_statement)
+] @punctuation.bracket
+
+[
+ "end"
+ (tag_name)
+] @function
+
+(variable_name) @variable
+
+(filter_name) @method
+(filter_argument) @parameter
+
+(keyword) @keyword
+
+(operator) @operator
+(variable "|" @operator)
+(paired_statement "=" @operator)
+(keyword_operator) @keyword.operator
+
+(number) @number
+
+(boolean) @boolean
+
+(string) @string
diff --git a/queries/htmldjango/indents.scm b/queries/htmldjango/indents.scm
new file mode 100644
index 000000000..8fa0a456c
--- /dev/null
+++ b/queries/htmldjango/indents.scm
@@ -0,0 +1,3 @@
+(paired_statement) @indent
+(end_paired_statement) @indent_end
+(branch_statement) @branch
diff --git a/queries/htmldjango/injections.scm b/queries/htmldjango/injections.scm
new file mode 100644
index 000000000..6e49e8dcd
--- /dev/null
+++ b/queries/htmldjango/injections.scm
@@ -0,0 +1 @@
+(content) @html @combined