joshuadavidthomas · joshuadavidthomas · Apr 21, 2025 · Apr 21, 2025 · Apr 21, 2025 · Apr 21, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project attempts to adhere to [Semantic Versioning](https://semver.org/
 
 - Bumped Rust toolchain from 1.83 to 1.86
 - Bumped PyO3 to 0.24.
+- **Internal**: Renamed template parsing crate to `djls-templates`
 
 ## [5.1.0a2]
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ resolver = "2"
 djls = { path = "crates/djls" }
 djls-project = { path = "crates/djls-project" }
 djls-server = { path = "crates/djls-server" }
-djls-template-ast = { path = "crates/djls-template-ast" }
+djls-templates = { path = "crates/djls-templates" }
 djls-worker = { path = "crates/djls-worker" }
 
 anyhow = "1.0"

diff --git a/README.md b/README.md
@@ -151,7 +151,7 @@ The project is written in Rust using PyO3 for Python integration. Here is a high
 - Main CLI interface ([`crates/djls/`](./crates/djls/))
 - Django and Python project introspection ([`crates/djls-project/`](./crates/djls-project/))
 - LSP server implementation ([`crates/djls-server/`](./crates/djls-server/))
-- Template parsing ([`crates/djls-template-ast/`](./crates/djls-template-ast/))
+- Template parsing ([`crates/djls-templates/`](./crates/djls-templates/))
 - Tokio-based background task management ([`crates/djls-worker/`](./crates/djls-worker/))
 
 Code contributions are welcome from developers of all backgrounds. Rust expertise is valuable for the LSP server and core components, but Python and Django developers should not be deterred by the Rust codebase - Django expertise is just as valuable. Understanding Django's internals and common development patterns helps inform what features would be most valuable.

diff --git a/crates/djls-server/Cargo.toml b/crates/djls-server/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 djls-project = { workspace = true }
-djls-template-ast = { workspace = true }
+djls-templates = { workspace = true }
 djls-worker = { workspace = true }
 
 anyhow = { workspace = true }

diff --git a/crates/djls-template-ast/Cargo.toml → crates/djls-templates/Cargo.toml b/crates/djls-template-ast/Cargo.toml → crates/djls-templates/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "djls-template-ast"
+name = "djls-templates"
 version = "0.0.0"
 edition = "2021"
 

diff --git a/crates/djls-template-ast/src/ast.rs → crates/djls-templates/src/ast.rs b/crates/djls-template-ast/src/ast.rs → crates/djls-templates/src/ast.rs
diff --git a/crates/djls-template-ast/src/error.rs → crates/djls-templates/src/error.rs b/crates/djls-template-ast/src/error.rs → crates/djls-templates/src/error.rs
diff --git a/crates/djls-template-ast/src/lexer.rs → crates/djls-templates/src/lexer.rs b/crates/djls-template-ast/src/lexer.rs → crates/djls-templates/src/lexer.rs
diff --git a/crates/djls-template-ast/src/lib.rs → crates/djls-templates/src/lib.rs b/crates/djls-template-ast/src/lib.rs → crates/djls-templates/src/lib.rs
diff --git a/crates/djls-template-ast/src/parser.rs → crates/djls-templates/src/parser.rs b/crates/djls-template-ast/src/parser.rs → crates/djls-templates/src/parser.rs
diff --git a/...ast__lexer__tests__tokenize_comments.snap → ...tes__lexer__tests__tokenize_comments.snap b/...ast__lexer__tests__tokenize_comments.snap → ...tes__lexer__tests__tokenize_comments.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/lexer.rs
+source: crates/djls-templates/src/lexer.rs
 expression: tokens
 ---
 - token_type:

diff --git a/..._lexer__tests__tokenize_django_block.snap → ..._lexer__tests__tokenize_django_block.snap b/..._lexer__tests__tokenize_django_block.snap → ..._lexer__tests__tokenize_django_block.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/lexer.rs
+source: crates/djls-templates/src/lexer.rs
 expression: tokens
 ---
 - token_type:

diff --git a/...xer__tests__tokenize_django_variable.snap → ...xer__tests__tokenize_django_variable.snap b/...xer__tests__tokenize_django_variable.snap → ...xer__tests__tokenize_django_variable.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/lexer.rs
+source: crates/djls-templates/src/lexer.rs
 expression: tokens
 ---
 - token_type:

diff --git a/...t__lexer__tests__tokenize_everything.snap → ...s__lexer__tests__tokenize_everything.snap b/...t__lexer__tests__tokenize_everything.snap → ...s__lexer__tests__tokenize_everything.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/lexer.rs
+source: crates/djls-templates/src/lexer.rs
 expression: tokens
 ---
 - token_type:

diff --git a/...ate_ast__lexer__tests__tokenize_html.snap → ...mplates__lexer__tests__tokenize_html.snap b/...ate_ast__lexer__tests__tokenize_html.snap → ...mplates__lexer__tests__tokenize_html.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/lexer.rs
+source: crates/djls-templates/src/lexer.rs
 expression: tokens
 ---
 - token_type:

diff --git a/...e_ast__lexer__tests__tokenize_script.snap → ...lates__lexer__tests__tokenize_script.snap b/...e_ast__lexer__tests__tokenize_script.snap → ...lates__lexer__tests__tokenize_script.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/lexer.rs
+source: crates/djls-templates/src/lexer.rs
 expression: tokens
 ---
 - token_type:

diff --git a/...te_ast__lexer__tests__tokenize_style.snap → ...plates__lexer__tests__tokenize_style.snap b/...te_ast__lexer__tests__tokenize_style.snap → ...plates__lexer__tests__tokenize_style.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/lexer.rs
+source: crates/djls-templates/src/lexer.rs
 expression: tokens
 ---
 - token_type:

diff --git a/...ser__tests__comments__parse_comments.snap → ...ser__tests__comments__parse_comments.snap b/...ser__tests__comments__parse_comments.snap → ...ser__tests__comments__parse_comments.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...tests__django__parse_complex_if_elif.snap → ...tests__django__parse_complex_if_elif.snap b/...tests__django__parse_complex_if_elif.snap → ...tests__django__parse_complex_if_elif.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...ests__django__parse_django_for_block.snap → ...ests__django__parse_django_for_block.snap b/...ests__django__parse_django_for_block.snap → ...ests__django__parse_django_for_block.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...tests__django__parse_django_if_block.snap → ...tests__django__parse_django_if_block.snap b/...tests__django__parse_django_if_block.snap → ...tests__django__parse_django_if_block.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/..._django__parse_django_tag_assignment.snap → ..._django__parse_django_tag_assignment.snap b/..._django__parse_django_tag_assignment.snap → ..._django__parse_django_tag_assignment.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...tests__django__parse_django_variable.snap → ...tests__django__parse_django_variable.snap b/...tests__django__parse_django_variable.snap → ...tests__django__parse_django_variable.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...o__parse_django_variable_with_filter.snap → ...o__parse_django_variable_with_filter.snap b/...o__parse_django_variable_with_filter.snap → ...o__parse_django_variable_with_filter.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...__tests__django__parse_filter_chains.snap → ...__tests__django__parse_filter_chains.snap b/...__tests__django__parse_filter_chains.snap → ...__tests__django__parse_filter_chains.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...__tests__django__parse_mixed_content.snap → ...__tests__django__parse_mixed_content.snap b/...__tests__django__parse_mixed_content.snap → ...__tests__django__parse_mixed_content.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...__tests__django__parse_nested_for_if.snap → ...__tests__django__parse_nested_for_if.snap b/...__tests__django__parse_nested_for_if.snap → ...__tests__django__parse_nested_for_if.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/..._tests__errors__parse_error_recovery.snap → ..._tests__errors__parse_error_recovery.snap b/..._tests__errors__parse_error_recovery.snap → ..._tests__errors__parse_error_recovery.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...s__errors__parse_unclosed_django_for.snap → ...s__errors__parse_unclosed_django_for.snap b/...s__errors__parse_unclosed_django_for.snap → ...s__errors__parse_unclosed_django_for.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...ts__errors__parse_unclosed_django_if.snap → ...ts__errors__parse_unclosed_django_if.snap b/...ts__errors__parse_unclosed_django_if.snap → ...ts__errors__parse_unclosed_django_if.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...sts__errors__parse_unclosed_html_tag.snap → ...sts__errors__parse_unclosed_html_tag.snap b/...sts__errors__parse_unclosed_html_tag.snap → ...sts__errors__parse_unclosed_html_tag.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...tests__errors__parse_unclosed_script.snap → ...tests__errors__parse_unclosed_script.snap b/...tests__errors__parse_unclosed_script.snap → ...tests__errors__parse_unclosed_script.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/..._tests__errors__parse_unclosed_style.snap → ..._tests__errors__parse_unclosed_style.snap b/..._tests__errors__parse_unclosed_style.snap → ..._tests__errors__parse_unclosed_style.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...r__tests__full_templates__parse_full.snap → ...r__tests__full_templates__parse_full.snap b/...r__tests__full_templates__parse_full.snap → ...r__tests__full_templates__parse_full.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...ser__tests__html__parse_html_doctype.snap → ...ser__tests__html__parse_html_doctype.snap b/...ser__tests__html__parse_html_doctype.snap → ...ser__tests__html__parse_html_doctype.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/..._parser__tests__html__parse_html_tag.snap → ..._parser__tests__html__parse_html_tag.snap b/..._parser__tests__html__parse_html_tag.snap → ..._parser__tests__html__parse_html_tag.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...parser__tests__html__parse_html_void.snap → ...parser__tests__html__parse_html_void.snap b/...parser__tests__html__parse_html_void.snap → ...parser__tests__html__parse_html_void.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/..._parser__tests__script__parse_script.snap → ..._parser__tests__script__parse_script.snap b/..._parser__tests__script__parse_script.snap → ..._parser__tests__script__parse_script.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...t__parser__tests__style__parse_style.snap → ...s__parser__tests__style__parse_style.snap b/...t__parser__tests__style__parse_style.snap → ...s__parser__tests__style__parse_style.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...space__parse_with_leading_whitespace.snap → ...space__parse_with_leading_whitespace.snap b/...space__parse_with_leading_whitespace.snap → ...space__parse_with_leading_whitespace.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...arse_with_leading_whitespace_newline.snap → ...arse_with_leading_whitespace_newline.snap b/...arse_with_leading_whitespace_newline.snap → ...arse_with_leading_whitespace_newline.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...pace__parse_with_trailing_whitespace.snap → ...pace__parse_with_trailing_whitespace.snap b/...pace__parse_with_trailing_whitespace.snap → ...pace__parse_with_trailing_whitespace.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/...rse_with_trailing_whitespace_newline.snap → ...rse_with_trailing_whitespace_newline.snap b/...rse_with_trailing_whitespace_newline.snap → ...rse_with_trailing_whitespace_newline.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/djls-template-ast/src/parser.rs
+source: crates/djls-templates/src/parser.rs
 expression: nodelist
 ---
 nodes:

diff --git a/crates/djls-template-ast/src/tagspecs.rs → crates/djls-templates/src/tagspecs.rs b/crates/djls-template-ast/src/tagspecs.rs → crates/djls-templates/src/tagspecs.rs
diff --git a/crates/djls-template-ast/src/tokens.rs → crates/djls-templates/src/tokens.rs b/crates/djls-template-ast/src/tokens.rs → crates/djls-templates/src/tokens.rs
diff --git a/crates/djls-template-ast/tagspecs/README.md → crates/djls-templates/tagspecs/README.md b/crates/djls-template-ast/tagspecs/README.md → crates/djls-templates/tagspecs/README.md
diff --git a/...es/djls-template-ast/tagspecs/django.toml → crates/djls-templates/tagspecs/django.toml b/...es/djls-template-ast/tagspecs/django.toml → crates/djls-templates/tagspecs/django.toml