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

simplify errors and remove unused methods

Browse source
This commit is contained in:
Josh Thomas 2025-01-04 22:13:15 -06:00
parent baeed3ed66
commit 6a2b13f6e7
1 changed files with 9 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,27 +21,22 @@ impl Parser {
Ok(node) => {
ast.add_node(node);
}
Err(ParserError::Ast(AstError::StreamError(kind))) if kind == "AtEnd" => {
break;
}
Err(ParserError::ErrorSignal(Signal::SpecialTag(_))) => {
continue;
}
Err(ParserError::Ast(err @ AstError::UnclosedTag(_))) => {
ast.add_error(err);
self.synchronize()?;
continue;
Err(err) => {
if let ParserError::Ast(err) = err {
ast.add_error(err);
self.synchronize()?;
continue;
}
return Err(err);
}
Err(ParserError::Ast(err)) => {
ast.add_error(err);
self.synchronize()?;
continue;
}
Err(err) => return Err(err),
}
}
Ok(ast.finalize()?)
ast.finalize()?;
Ok(ast)
}
fn next_node(&mut self) -> Result<Node, ParserError> {
@ -255,18 +250,10 @@ impl Parser {
self.peek_at(0)
}
fn peek_next(&self) -> Result<Token, ParserError> {
self.peek_at(1)
}
fn peek_previous(&self) -> Result<Token, ParserError> {
self.peek_at(-1)
}
fn peek_back(&self, steps: usize) -> Result<Vec<Token>, ParserError> {
(1..=steps).map(|i| self.peek_at(-(i as isize))).collect()
}
fn peek_at(&self, offset: isize) -> Result<Token, ParserError> {
let index = self.current as isize + offset;
self.item_at(index as usize)
@ -301,14 +288,6 @@ impl Parser {
self.peek_previous()
}
fn backtrack(&mut self, steps: usize) -> Result<Token, ParserError> {
if self.current < steps {
return Err(ParserError::stream_error("AtBeginning"));
}
self.current -= steps;
self.peek_next()
}
fn synchronize(&mut self) -> Result<(), ParserError> {
let sync_types = [
TokenType::DjangoBlock(String::new()),