Support whitespace control liquid tags; fix single line if/endif indentation issue #19
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
|
Can you do a clean rebase without a merge? I made an attempt at this myself and went cross-eyed trying to understand the conflict. |
|
I just cherry-picked the first commit, hopefully that makes things easier. |
|
No problem, I just did a quick rebase of my patch on top of your work plus the cherry-pick. How does this look now? |
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.
This PR is two small patches -- the first adds support for liquid tags using whitespace control syntax, the second is a patch from @sikachu fixing an indentation issue when an if/endif tag pair occurs on the same line.
Both patches seem to work fine here, I've been working with liquid files using them for the past week, but I'm no vim script expert so I'd appreciate any feedback.