Merge pull request #29 from GuillaumeGomez/improve-ui-error

Improve error message in case too much nesting
rinja-rs · Jun 23, 2024 · bd36c4b · bd36c4b
2 parents 704c506 + 1f1cff0
commit bd36c4b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/rinja_parser/src/lib.rs b/rinja_parser/src/lib.rs
@@ -711,10 +711,10 @@ pub(crate) struct Level(u8);
 impl Level {
     fn nest(self, i: &str) -> ParseResult<'_, Level> {
         if self.0 >= Self::MAX_DEPTH {
-            return Err(ErrorContext::from_err(nom::Err::Failure(error_position!(
+            return Err(nom::Err::Failure(ErrorContext::new(
+                "your template code is too deeply nested, or last expression is too complex",
                 i,
-                ErrorKind::TooLarge
-            ))));
+            )));
         }
 
         Ok((i, Level(self.0 + 1)))

diff --git a/testing/tests/ui/excessive_nesting.stderr b/testing/tests/ui/excessive_nesting.stderr
@@ -1,4 +1,5 @@
-error: failed to parse template source at row 14, column 42 near:
+error: your template code is too deeply nested, or last expression is too complex
+       failed to parse template source at row 14, column 42 near:
        "%}{%if 1%}{%if 1%}{%if 1%}{%if 1%}{%if 1"...
  --> tests/ui/excessive_nesting.rs:3:10
   |

diff --git a/testing/tests/ui/filter-recursion.stderr b/testing/tests/ui/filter-recursion.stderr
@@ -1,5 +1,6 @@
-error: failed to parse template source
- --> testing/templates/filter-recursion.html:1:255
+error: your template code is too deeply nested, or last expression is too complex
+       failed to parse template source
+         --> testing/templates/filter-recursion.html:1:255
        "|A|AA|A|A|A|A|AA|A|A|A|A|AA|A|A|A|A|AA|A"...
  --> tests/ui/filter-recursion.rs:3:10
   |