diff --git a/crates/djls-template-ast/grammar.ebnf b/crates/djls-template-ast/grammar.ebnf index c7fe247..78380cf 100644 --- a/crates/djls-template-ast/grammar.ebnf +++ b/crates/djls-template-ast/grammar.ebnf @@ -23,7 +23,7 @@ TAG_END = "%}" ; COMMENT_START = "{#" ; COMMENT_END = "#}" ; -SPECIAL_SEQUENCE = VAR_START | VAR_END | TAG_START | TAG_END +SPECIAL_SEQUENCE = VAR_START | VAR_END | TAG_START | TAG_END | COMMENT_START | COMMENT_END ; TEXT_CHAR = ANY_CHAR - SPECIAL_SEQUENCE ; TEXT = { TEXT_CHAR }+ ; diff --git a/crates/djls-template-ast/src/error.rs b/crates/djls-template-ast/src/error.rs index 2c14c37..b130226 100644 --- a/crates/djls-template-ast/src/error.rs +++ b/crates/djls-template-ast/src/error.rs @@ -9,16 +9,16 @@ use thiserror::Error; pub enum TemplateError { #[error("Lexer error: {0}")] Lexer(String), - + #[error("Parser error: {0}")] Parser(String), - + #[error("Validation error: {0}")] Validation(#[from] AstError), - + #[error("IO error: {0}")] Io(String), - + #[error("Configuration error: {0}")] Config(String), } @@ -50,7 +50,7 @@ impl TemplateError { _ => None, } } - + pub fn severity(&self) -> lsp_types::DiagnosticSeverity { match self { TemplateError::Lexer(_) | TemplateError::Parser(_) => {