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

checkpoint

Browse source
This commit is contained in:
Josh Thomas 2025-01-06 11:06:26 -06:00
parent 6d26d78099
commit ad9d6e56b0
13 changed files with 83 additions and 831 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -261,12 +261,10 @@ impl Parser {
let start_token = self.peek_previous()?;
let start_pos = start_token.start().unwrap_or(0);
// If we start with a newline, skip it
if matches!(start_token.token_type(), TokenType::Newline) {
return self.next_node();
}
// Use TokenType's Display implementation for formatting
let mut text = start_token.token_type().to_string();
let mut total_length: u32 = u32::try_from(text.len()).unwrap();
@ -286,7 +284,6 @@ impl Parser {
}
}
// Skip empty text nodes
if text.trim().is_empty() {
self.next_node()
} else {
@ -303,14 +300,18 @@ impl Parser {
start: &str,
end: Option<&str>,
) -> Result<Node, ParserError> {
let start_token = self.peek_previous()?;
let start_pos = start_token.start().unwrap_or(0);
let total_length = (content.len() + start.len() + end.map_or(0, |e| e.len())) as u32;
let span = Span::new(start_pos, total_length);
Ok(Node::Comment {
content: content.to_string(),
span,
})
let token = self.peek_previous()?;
let start_pos = token.start().unwrap_or(0);
// Only treat Django comments as Comment nodes
if start == "{#" && end == Some("#}") {
Ok(Node::Comment {
content: content.to_string(),
span: Span::new(start_pos, token.token_type().len().unwrap_or(0) as u32),
})
} else {
self.parse_text()
}
}
fn peek(&self) -> Result<Token, ParserError> {