diff --git a/packages/templating/plugin/html_scanner.js b/packages/templating/plugin/html_scanner.js
index c8c87ed30c..5fca649a3a 100644
--- a/packages/templating/plugin/html_scanner.js
+++ b/packages/templating/plugin/html_scanner.js
@@ -23,7 +23,7 @@ html_scanner = {
var throwParseError = function (msg, overrideIndex) {
var ret = new html_scanner.ParseError;
- ret.message = msg || "bad formatting in HTML template";
+ ret.message = msg || "bad formatting in template file";
ret.file = source_name;
var theIndex = (typeof overrideIndex === 'number' ? overrideIndex : index);
ret.line = contents.substring(0, theIndex).split('\n').length;
@@ -39,7 +39,8 @@ html_scanner = {
var match = rOpenTag.exec(rest);
if (! match)
- throwParseError(); // unknown text encountered
+ throwParseError("Expected , , or tag" +
+ " in template file");
var matchToken = match[1];
var matchTokenTagName = match[3];
@@ -55,7 +56,7 @@ html_scanner = {
// top-level HTML comment
var commentEnd = /--\s*>/.exec(rest);
if (! commentEnd)
- throwParseError("unclosed HTML comment");
+ throwParseError("unclosed HTML comment in template file");
advance(commentEnd.index + commentEnd[0].length);
continue;
}
diff --git a/packages/templating/scanner_tests.js b/packages/templating/scanner_tests.js
index 8e328eabbc..d85290cdc9 100644
--- a/packages/templating/scanner_tests.js
+++ b/packages/templating/scanner_tests.js
@@ -47,7 +47,7 @@ Tinytest.add("templating - html scanner", function (test) {
checkError(function() {
return html_scanner.scan("asdf");
- }, "formatting in HTML template", 1);
+ }, "Expected , , or tag in template file", 1);
// body all on one line
checkResults(
@@ -126,7 +126,7 @@ Tinytest.add("templating - html scanner", function (test) {
// bad open tag
checkError(function() {
return html_scanner.scan("\n\n\n\n Hello\n");
- }, "formatting in HTML template", 4);
+ }, "Expected , , or tag in template file", 4);
checkError(function() {
return html_scanner.scan("\n\n\n\n\n Hello\n");
}, "error in tag", 5);
@@ -167,4 +167,9 @@ Tinytest.add("templating - html scanner", function (test) {
'pizza');
}, "error in tag", 1);
+ // unexpected at top level
+ checkError(function() {
+ return html_scanner.scan('\n\n');
+ }, "Expected , , or tag in template file", 2);
+
});