josh/django-language-server
1
0
Fork 0
mirror of https://github.com/joshuadavidthomas/django-language-server.git synced 2025-09-11 12:56:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

simplify arg checking

Browse source
This commit is contained in:
Josh Thomas 2025-09-08 21:02:40 -05:00
parent 077a5f2961
commit 2311fb3288
2 changed files with 24 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/djls-templates/src/templatetags.rs
View file

@ -1,5 +1,6 @@
mod specs; mod specs;
pub use specs::ArgSpec;
pub use specs::TagSpecs; pub use specs::TagSpecs;
pub enum TagType { pub enum TagType {

68
crates/djls-templates/src/validation.rs
View file

@ -23,6 +23,7 @@ use crate::ast::Span;
use crate::ast::TagName; use crate::ast::TagName;
use crate::ast::TagNode; use crate::ast::TagNode;
use crate::db::Db as TemplateDb; use crate::db::Db as TemplateDb;
use crate::templatetags::ArgSpec;
use crate::templatetags::TagType; use crate::templatetags::TagType;
use crate::Ast; use crate::Ast;
@ -52,9 +53,20 @@ impl<'db> TagValidator<'db> {
if let Some(Node::Tag { name, bits, span }) = self.current_node() { if let Some(Node::Tag { name, bits, span }) = self.current_node() {
let name_str = name.text(self.db); let name_str = name.text(self.db);
match TagType::for_name(&name_str, &self.db.tag_specs()) { let tag_specs = self.db.tag_specs();
let tag_type = TagType::for_name(&name_str, &tag_specs);
let arg_spec = match tag_type {
TagType::Closer => tag_specs
.get_end_spec_for_closer(&name_str)
.and_then(|s| s.args.as_ref()),
_ => tag_specs.get(&name_str).and_then(|s| s.args.as_ref()),
};
self.check_arguments(&name_str, &bits, span, arg_spec);
match tag_type {
TagType::Opener => { TagType::Opener => {
self.check_arguments(&name_str, &bits, span);
self.stack.push(TagNode { self.stack.push(TagNode {
name, name,
bits: bits.clone(), bits: bits.clone(),
@ -62,15 +74,13 @@ impl<'db> TagValidator<'db> {
}); });
} }
TagType::Intermediate => { TagType::Intermediate => {
self.check_arguments(&name_str, &bits, span);
self.handle_intermediate(&name_str, span); self.handle_intermediate(&name_str, span);
} }
TagType::Closer => { TagType::Closer => {
self.check_closer_arguments(&name_str, &bits, span);
self.handle_closer(name, &bits, span); self.handle_closer(name, &bits, span);
} }
TagType::Standalone => { TagType::Standalone => {
self.check_arguments(&name_str, &bits, span); // No additional action needed for standalone tags
} }
} }
} }
@ -89,46 +99,14 @@ impl<'db> TagValidator<'db> {
self.errors self.errors
} }
fn check_arguments(&mut self, name: &str, bits: &[String], span: Span<'db>) { fn check_arguments(
let tag_specs = self.db.tag_specs(); &mut self,
let Some(spec) = tag_specs.get(name) else { name: &str,
return; bits: &[String],
}; span: Span<'db>,
arg_spec: Option<&ArgSpec>,
let Some(arg_spec) = &spec.args else { ) {
return; let Some(arg_spec) = arg_spec else {
};
if let Some(min) = arg_spec.min {
if bits.len() < min {
self.errors.push(AstError::MissingRequiredArguments {
tag: name.to_string(),
min,
span_start: span.start(self.db),
span_length: span.length(self.db),
});
}
}
if let Some(max) = arg_spec.max {
if bits.len() > max {
self.errors.push(AstError::TooManyArguments {
tag: name.to_string(),
max,
span_start: span.start(self.db),
span_length: span.length(self.db),
});
}
}
}
fn check_closer_arguments(&mut self, name: &str, bits: &[String], span: Span<'db>) {
let tag_specs = self.db.tag_specs();
let Some(end_spec) = tag_specs.get_end_spec_for_closer(name) else {
return;
};
let Some(arg_spec) = &end_spec.args else {
return; return;
}; };