Better Error messages and location information. Updates #53

Author: flosch

pongo2_test.go

@@ -40,7 +40,9 @@ func parseTemplateFn(s string, c Context) func() {
 func (s *TestSuite) TestMisc(c *C) {
 	// Must
 	// TODO: Add better error message (see issue #18)
-	c.Check(func() { Must(test_suite2.FromFile("template_tests/inheritance/base2.tpl")) }, PanicMatches, `\[Error \(where: fromfile\) in template_tests/inheritance/doesnotexist.tpl\] open template_tests/inheritance/doesnotexist.tpl: no such file or directory`)
+	c.Check(func() { Must(test_suite2.FromFile("template_tests/inheritance/base2.tpl")) },
+		PanicMatches,
+		`\[Error \(where: fromfile\) in template_tests/inheritance/doesnotexist.tpl | Line 1 Col 12 near 'doesnotexist.tpl'\] open template_tests/inheritance/doesnotexist.tpl: no such file or directory`)
 
 	// Context
 	c.Check(parseTemplateFn("", Context{"'illegal": nil}), PanicMatches, ".*not a valid identifier.*")

tags_import.go

@@ -43,8 +43,7 @@ func tagImportParser(doc *Parser, start *Token, arguments *Parser) (INodeTag, *E
 	// Compile the given template
 	tpl, err := doc.template.set.FromFile(import_node.filename)
 	if err != nil {
-		return nil, arguments.Error(fmt.Sprintf("Could not compile '%s': %s", import_node.filename, err.Error()),
-			filename_token)
+		return nil, err.updateFromTokenIfNeeded(start)
 	}
 
 	for arguments.Remaining() > 0 {

tags_include.go

@@ -73,14 +73,14 @@ func tagIncludeParser(doc *Parser, start *Token, arguments *Parser) (INodeTag, *
 		include_node.filename = included_filename
 		included_tpl, err := doc.template.set.FromFile(included_filename)
 		if err != nil {
-			return nil, err
+			return nil, err.updateFromTokenIfNeeded(filename_token)
 		}
 		include_node.tpl = included_tpl
 	} else {
 		// No String, then the user wants to use lazy-evaluation (slower, but possible)
 		filename_evaluator, err := arguments.ParseExpression()
 		if err != nil {
-			return nil, err
+			return nil, err.updateFromTokenIfNeeded(filename_token)
 		}
 		include_node.filename_evaluator = filename_evaluator
 		include_node.lazy = true
@@ -99,7 +99,7 @@ func tagIncludeParser(doc *Parser, start *Token, arguments *Parser) (INodeTag, *
 			}
 			value_expr, err := arguments.ParseExpression()
 			if err != nil {
-				return nil, err
+				return nil, err.updateFromTokenIfNeeded(key_token)
 			}
 
 			include_node.with_pairs[key_token.Val] = value_expr

tags_ssi.go

@@ -39,17 +39,17 @@ func tagSSIParser(doc *Parser, start *Token, arguments *Parser) (INodeTag, *Erro
 			// parsed
 			temporary_tpl, err := doc.template.set.FromFile(doc.template.set.resolveFilename(doc.template, file_token.Val))
 			if err != nil {
-				return nil, err
+				return nil, err.updateFromTokenIfNeeded(file_token)
 			}
 			ssi_node.template = temporary_tpl
 		} else {
 			// plaintext
 			buf, err := ioutil.ReadFile(doc.template.set.resolveFilename(doc.template, file_token.Val))
 			if err != nil {
-				return nil, &Error{
+				return nil, (&Error{
 					Sender:   "tag:ssi",
 					ErrorMsg: err.Error(),
-				}
+				}).updateFromTokenIfNeeded(file_token)
 			}
 			ssi_node.content = string(buf)
 		}

template_tests/sandbox-compilation.err.out

@@ -1,3 +1,3 @@
 .*Usage of filter 'banned_filter' is not allowed \(sandbox restriction active\).
 .*Usage of tag 'banned_tag' is not allowed \(sandbox restriction active\).
-\[Error \(where: fromfile\)\] open : no such file or directory
+\[Error \(where: fromfile\) | Line 1 Col 12 near '../../test_not_existent'\] open : no such file or directory