This repository has been archived by the owner on Apr 11, 2018. It is now read-only.
Fixed limitation where macros (and other similar tokens) would not get preserved #132
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
|
Sorry to do this, but #133 makes a huge change to the file layout (and test runner). So this can't be easily merged in. Let me know if you want to just throw things at me and make me fix this myself :) |
Conflicts: lib/parser.js lib/tags/block.test.js
|
No worries - bad timing. I've remerged with your changes. Let me know if i did anything wrong.. I tend to stumble my way through git. |
| @@ -394,13 +394,18 @@ function precompile(indent, context) { | |||
| } | |||
|
|
|||
| } | |||
| } else if (token.name === 'set') { | |||
| } else if (token.type === LOGIC_TOKEN || token.type === VAR_TOKEN) { | |||
There was a problem hiding this comment.
It looks like this only needs to be the following:
} else if (token.type === LOGIC_TOKEN) {
There was a problem hiding this comment.
Ah good point - I was thinking I needed this for macros, but the definition of a macro is the only case that needs to be preserved. Removed.
|
Fixed. |
paularmstrong
added a commit
that referenced
this pull request
Oct 28, 2012
Fixed limitation where macros would not get preserved across parent/children
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 includes a fix for an issue where macros and other similar template code will not get preserved when defined in a derived file.
Added unit test that demonstrates the previous limitation as well as a fix within the parser. The new behavior is that anything within {% %} and {{ }} will get preserved across an "extends".