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

fix

Browse source
This commit is contained in:
Josh Thomas 2025-01-04 22:20:23 -06:00
parent 6a2b13f6e7
commit 3de9d1bb19
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/djls-template-ast/src/parser.rs
View file

@ -24,6 +24,9 @@ impl Parser {
Err(ParserError::ErrorSignal(Signal::SpecialTag(_))) => { Err(ParserError::ErrorSignal(Signal::SpecialTag(_))) => {
continue; continue;
} }
Err(ParserError::Ast(AstError::StreamError(kind))) if kind == "AtEnd" => {
break;
}
Err(err) => { Err(err) => {
if let ParserError::Ast(err) = err { if let ParserError::Ast(err) = err {
ast.add_error(err); ast.add_error(err);
@ -46,10 +49,6 @@ impl Parser {
let token = self.peek()?; let token = self.peek()?;
let node = match token.token_type() { let node = match token.token_type() {
TokenType::Comment(content, start, end) => {
self.consume()?;
self.parse_comment(content, start, end.as_deref())
}
TokenType::DjangoBlock(content) => { TokenType::DjangoBlock(content) => {
self.consume()?; self.consume()?;
self.parse_django_block(content) self.parse_django_block(content)
@ -58,6 +57,10 @@ impl Parser {
self.consume()?; self.consume()?;
self.parse_django_variable(content) self.parse_django_variable(content)
} }
TokenType::Comment(content, start, end) => {
self.consume()?;
self.parse_comment(content, start, end.as_deref())
}
TokenType::Text(_) TokenType::Text(_)
| TokenType::Whitespace(_) | TokenType::Whitespace(_)
| TokenType::Newline | TokenType::Newline
@ -604,7 +607,7 @@ mod tests {
let ast = parser.parse().unwrap(); let ast = parser.parse().unwrap();
insta::assert_yaml_snapshot!(ast); insta::assert_yaml_snapshot!(ast);
assert_eq!(ast.errors().len(), 1); assert_eq!(ast.errors().len(), 1);
assert!(matches!(&ast.errors()[0], AstError::UnclosedTag(tag) if tag == "div")); assert!(matches!(&ast.errors()[0], AstError::UnclosedTag(tag) if tag == "if"));
} }
} }