Avoid tag cycles when keeping track of parent paths for blocks#363
Merged
Conversation
…resolve relative paths"" This reverts commit 769da25.
liamrharwood
commented
Aug 21, 2019
| for (Node child : block) { | ||
| for (Node child : block.getNodes()) { | ||
| boolean pushedParentPathOntoStack = false; | ||
| if (block.getParentPath().isPresent() && !getContext().getCurrentPathStack().contains(block.getParentPath().get())) { |
Contributor
Author
There was a problem hiding this comment.
it will only push the parent path onto the stack if the stack does not already contain the parent path
liamrharwood
commented
Aug 21, 2019
|
|
||
| blockValueBuilder.addNode(child.render(this)); | ||
|
|
||
| if (pushedParentPathOntoStack) { |
Contributor
Author
There was a problem hiding this comment.
This also will only pop the parent path off the stack if it was pushed onto the stack to begin with
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fix for #359 because it was causing
TagCycleExceptionswhen pushing a parent path onto thecurrentPathStack.This changes the solution from that PR so that it will only push the parent path onto the stack if the stack does not already contain the parent path. For instance, this handles a situation where a template using
extends/blockisincluded in a different template, so the path is already in the stack.This also will only pop the parent path off the stack if it was pushed onto the stack to begin with.