Improved parsing of flavor-specific tag 'include_relative' #300
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* In Jekyll style, 'include_relative' was represented as token SimpleTag, instead of IncludeRelative, as expected since PR bkiers#288. * As a consequence, filename components were parsed as separate parameters instead of token file_name_or_output. This behaviour got unnoticed only because all parameters were incorrectly concatenated into one string (to be fixed outside of this commit) * In Liquid style, tag 'include_relative' is not defined (token InvalidTagId), but can be defined as a custom block (token SimpleBlock) or a tag (SimpleTag). * To facilitate flavor-specific lexical analysis, flag isLiquidStyleInclude was was added to LiquidLexer; same code as in the LiquidParser since bkiers#196
|
Good point. I added that flag to parser but in fact it should be in lexer. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SimpleTag, instead ofIncludeRelative(as expected in PR [WIP] include_relative tag support #288). Seems to be caused by Lexer action which should be executed only for Liquid style.InvalidTagId), but can be defined as a custom block (tokenSimpleBlock) or a tag (SimpleTag). Lexer action works correctly for these checks.isLiquidStyleIncludetoLiquidLexer; same flag was added to theLiquidParserinincludewithwithsyntax should throw an expection in Jekyll flavour #196.@msangel Please let me know if you see a better or simpler solution. I do not work with Jekyll, I am submitting this change as a prerequisite for rendering of custom tags with two or more parameters in Liquid.