Fix error file reporting #1601

Merged
merged 2 commits into from Oct 4, 2013

Projects

None yet

3 participants

@maul-esel
Contributor

This PR fixes 2 quirks in jekyll's liquid error reporting, specifically which file the error occured on:

  • Firstly, it extends #1596 to work for parse-time errors (such as unknown tags), while it previously only worked for render-time errors.
  • Secondly, the original report #1591 related to layouts and was thus not fixed by #1596. This PR now also fixes the error reporting for liquid errors in layouts.

Sorry for not testing this before opening #1596, but I had no ruby install available. It's tested this time, for both cases.

//cc @IQAndreas, @mattr-

maul-esel added some commits Oct 3, 2013
@maul-esel maul-esel Move catching of liquid errors in include tags
The previous code only caught render-time errors. This change
makes it catch parse-time errors as well, such as unknown tags.
809ab5e
@maul-esel maul-esel output correct path in case of liquid error in layout
As with includes, an error in a layout was reported on the
page that used the layout. Fix this by passing on the path
of the layout that is rendered.
76ada8c
@parkr
Member
parkr commented Oct 3, 2013

Great catch! Thanks!

@mattr-
Member
mattr- commented Oct 4, 2013

Awesome. Thanks! ❤️

@mattr- mattr- merged commit 2bb2921 into jekyll:master Oct 4, 2013

1 check passed

default The Travis CI build passed
Details
@mattr- mattr- added a commit that referenced this pull request Oct 4, 2013
@mattr- mattr- Update history to reflect merge of #1601 a5cb8c9
@maul-esel maul-esel deleted the maul-esel:fix-error-file branch Oct 4, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment