Commit b94b2db
Fix nested relative import resolution in EagerFromTag
Extends the nested relative import fix to eager execution mode. EagerFromTag
had the same issue as FromTag - it wasn't managing currentPathStack for
relative path resolution.
Changes:
- EagerFromTag now properly pushes/pops currentPathStack during template processing
- Removed eager mode bypasses from tests since both modes now work correctly
- Added specific test for eager mode nested relative imports
This ensures consistent behavior between regular and eager execution modes
for nested HubL relative imports.
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <[email protected]>1 parent be87aa1 commit b94b2db
File tree
3 files changed
+52
-15
lines changed- src
- main/java/com/hubspot/jinjava/lib/tag/eager
- test/java/com/hubspot/jinjava/lib/tag
- eager
3 files changed
+52
-15
lines changedLines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
93 | 97 | | |
94 | 98 | | |
95 | 99 | | |
96 | 100 | | |
| 101 | + | |
97 | 102 | | |
98 | 103 | | |
99 | 104 | | |
| |||
Lines changed: 0 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | 117 | | |
121 | 118 | | |
122 | 119 | | |
| |||
169 | 166 | | |
170 | 167 | | |
171 | 168 | | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | 169 | | |
176 | 170 | | |
177 | 171 | | |
| |||
219 | 213 | | |
220 | 214 | | |
221 | 215 | | |
222 | | - | |
223 | | - | |
224 | | - | |
225 | 216 | | |
226 | 217 | | |
227 | 218 | | |
| |||
275 | 266 | | |
276 | 267 | | |
277 | 268 | | |
278 | | - | |
279 | | - | |
280 | | - | |
281 | 269 | | |
282 | 270 | | |
283 | 271 | | |
| |||
334 | 322 | | |
335 | 323 | | |
336 | 324 | | |
337 | | - | |
338 | | - | |
339 | | - | |
340 | 325 | | |
341 | 326 | | |
342 | 327 | | |
| |||
Lines changed: 47 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
126 | 173 | | |
0 commit comments