Skip to content

Track correct path for multiple level of Extends inheritance#667

Merged
bkrainer merged 3 commits intomasterfrom
nested-extend-paths
May 20, 2021
Merged

Track correct path for multiple level of Extends inheritance#667
bkrainer merged 3 commits intomasterfrom
nested-extend-paths

Conversation

@bkrainer
Copy link
Contributor

@bkrainer bkrainer commented May 19, 2021

We're not tracking the currentPath correctly when dealing with multiple levels of inheritance via extends tags, which is leading to incorrect relative path resolution.

Prior to this PR, the test example: https://github.com/HubSpot/jinjava/pull/667/files#diff-2970b2d908f3ae9b6918c9b1bd9c7b678a92a8a054cb2c9bded5817bd4a41a9eR1

would resolve ./hello.html to /tags/extendstag/relative/hello.html because it was incorrectly using tags/extendstag/relative/nested-relative-extends-2.jinja as the current path.

@bkrainer bkrainer marked this pull request as ready for review May 19, 2021 15:47
Copy link
Contributor

@jasmith-hs jasmith-hs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bkrainer bkrainer merged commit f3053dd into master May 20, 2021
@bkrainer bkrainer deleted the nested-extend-paths branch May 20, 2021 19:04
bkrainer added a commit that referenced this pull request May 21, 2021
add change from #667
@bkrainer bkrainer mentioned this pull request May 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants