This commit is contained in:
harttle
2017-01-21 19:41:59 +08:00
parent 21a5ac7e08
commit af284daf34
3 changed files with 10 additions and 8 deletions
+7 -5
View File
@@ -1322,16 +1322,17 @@ TokenizationError.prototype = Object.create(Error.prototype);
TokenizationError.prototype.constructor = TokenizationError; TokenizationError.prototype.constructor = TokenizationError;
function ParseError(e, token) { function ParseError(e, token) {
_.assign(this, e);
this.originalError = e;
this.name = this.constructor.name; this.name = this.constructor.name;
this.stack = e.stack;
this.input = token.input; this.input = token.input;
this.line = token.line; this.line = token.line;
this.file = token.file; this.file = token.file;
var context = mkContext(token.input, token.line); var context = mkContext(token.input, token.line);
this.message = mkMessage(e.message, token); this.message = mkMessage(e.message || 'Unkown Error', token);
this.stack = context + '\n' + (this.stack || ''); this.stack = context + '\n' + (e.stack || '');
} }
ParseError.prototype = Object.create(Error.prototype); ParseError.prototype = Object.create(Error.prototype);
ParseError.prototype.constructor = ParseError; ParseError.prototype.constructor = ParseError;
@@ -1341,15 +1342,16 @@ function RenderError(e, tpl) {
if (e instanceof RenderError) { if (e instanceof RenderError) {
return e; return e;
} }
_.assign(this, e);
this.originalError = e;
this.name = this.constructor.name; this.name = this.constructor.name;
this.stack = e.stack;
this.input = tpl.token.input; this.input = tpl.token.input;
this.line = tpl.token.line; this.line = tpl.token.line;
this.file = tpl.token.file; this.file = tpl.token.file;
var context = mkContext(tpl.token.input, tpl.token.line); var context = mkContext(tpl.token.input, tpl.token.line);
this.message = mkMessage(e.message, tpl.token); this.message = mkMessage(e.message || 'Unkown Error', tpl.token);
this.stack = context + '\n' + (e.stack || ''); this.stack = context + '\n' + (e.stack || '');
} }
RenderError.prototype = Object.create(Error.prototype); RenderError.prototype = Object.create(Error.prototype);
+2 -2
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "shopify-liquid", "name": "shopify-liquid",
"version": "1.6.1", "version": "1.6.2",
"description": "A feature-rich Liquid template engine for Node.js and browsers, with compliance with the Ruby version.", "description": "A feature-rich Liquid template engine for Node.js and browsers, with compliance with the Ruby version.",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {