Fix treatment of standalone tags. #15
Merged
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
Lines containing ^, /, !, <, or = tags should be stripped from the output if the tags are standalone. The least intrusive way to handle this I could find was to simply "expand" the endpoints of such tags to fill the line - all existing logic will continue to just work. This fixes 29 spec test failures.
| @@ -386,20 +386,26 @@ Tag Renderer::findTag(const QString& content, int pos, int endPos) | |||
| if (typeChar == '#') { | |||
| tag.type = Tag::SectionStart; | |||
| tag.key = readTagName(content, pos+1, endPos); | |||
| expandTag(tag, content); | |||
There was a problem hiding this comment.
Could these duplicated expandTag() calls be replaced with a 'if (tag.type != Tag::Value) { /* expand tag */ }' test after if () else ... block?
There was a problem hiding this comment.
Good idea. Fixed.
(I guess I was thinking in case a new tag type appears it's less likely to bring in unwanted behavior for it. But that's probably very unlikely.)
| * | ||
| * A tag is standalone if it is the only non-whitespace token on the the line. | ||
| */ | ||
| void expandTag(Tag& tag, const QString &content) const; |
There was a problem hiding this comment.
Small nit - coding convention in mustache.h/cpp is 'const T&' rather than 'const T &'. This function can also be static since it doesn't read or modify any fields.
|
Good to go? I have a fix for standalone partials indentation to follow this up with :) |
robertknight
added a commit
that referenced
this pull request
Aug 19, 2014
Fix treatment of standalone tags.
|
Yup - Thanks again @estan! |
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.
Lines containing ^, /, !, <, or = tags should be stripped from the output if the tags are standalone. The least intrusive way to handle this I could find was to simply "expand" the endpoints of such tags to fill the line - all existing logic will continue to just work.
This fixes 29 spec test failures.
I think all the 13 remaining failures fall into one of these categories:
I'll might try to tackle the last one next.