Skip to content

Fix HubL from tag nested relative import resolution #1248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maple-buice merged 11 commits into from
Jun 13, 2025
Merged

Fix HubL from tag nested relative import resolution #1248

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e491ee2
Fix nested relative import resolution in FromTag
Jun 5, 2025
6526a6a
Fix nested relative import resolution in EagerFromTag
Jun 5, 2025
529448c
Fix warnings, make relativePathResolver final
Jun 5, 2025
34ff246
Refactor test methods to follow single responsibility principle
Jun 5, 2025
0d9a205
Improve test quality and eliminate redundancy
Jun 5, 2025
a800f68
Remove unnecessary public getFromStack method
maple-buice Jun 5, 2025
3c852f3
Replace CallStack.size() with peek() for path stack integrity test
maple-buice Jun 5, 2025
12abbb9
Fix spelling
maple-buice Jun 5, 2025
61ad195
Update tags to use ImportTag.parseTemplateAsNode
Jun 10, 2025
f33b455
Simplify test setup
Jun 10, 2025
c213d7a
Fix stack popping
maple-buice Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/com/hubspot/jinjava/lib/tag/FromTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
Map<String, String> imports = getImportMap(helper);

try {
interpreter
.getContext()
.getCurrentPathStack()
.push(templateFile, tagNode.getLineNumber(), tagNode.getStartPosition());

Copy link
Contributor

@jasmith-hs jasmith-hs Jun 10, 2025

Choose a reason for hiding this comment

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

You could use ImportTag#parseTemplateAsNode

Copy link
Contributor Author

@maple-buice maple-buice Jun 10, 2025

Choose a reason for hiding this comment

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

Great point. Updated to do so and moved context stack popping into the finally block to match ImportTag.

String template = interpreter.getResource(templateFile);
Node node = interpreter.parse(template);

Expand All @@ -98,6 +103,7 @@ public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
child.render(node);
} finally {
JinjavaInterpreter.popCurrent();
interpreter.getContext().getCurrentPathStack().pop();
}

interpreter.addAllChildErrors(templateFile, child.getErrorsCopy());
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerFromTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
String templateFile = maybeTemplateFile.get();
try {
try {
interpreter
.getContext()
.getCurrentPathStack()
.push(templateFile, tagToken.getLineNumber(), tagToken.getStartPosition());

String template = interpreter.getResource(templateFile);
Node node = interpreter.parse(template);

Expand All @@ -95,6 +100,7 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
output = child.render(node);
} finally {
JinjavaInterpreter.popCurrent();
interpreter.getContext().getCurrentPathStack().pop();
}

interpreter.addAllChildErrors(templateFile, child.getErrorsCopy());
Expand Down
Loading