Resolve the templateFile before the include tag is interpreted in case

the variable changes/becomes deferred

Author: jasmith-hs

src/main/java/com/hubspot/jinjava/lib/tag/IncludeTag.java

@@ -60,25 +60,7 @@ public class IncludeTag implements Tag {
 
   @Override
   public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
-    HelperStringTokenizer helper = new HelperStringTokenizer(tagNode.getHelpers());
-    if (!helper.hasNext()) {
-      throw new TemplateSyntaxException(
-        tagNode.getMaster().getImage(),
-        "Tag 'include' expects template path",
-        tagNode.getLineNumber(),
-        tagNode.getStartPosition()
-      );
-    }
-
-    String path = StringUtils.trimToEmpty(helper.next());
-    String templateFile = interpreter.resolveString(
-      path,
-      tagNode.getLineNumber(),
-      tagNode.getStartPosition()
-    );
-    templateFile = interpreter.resolveResourceLocation(templateFile);
-
-    final String finalTemplateFile = templateFile;
+    final String finalTemplateFile = resolveTemplateFile(tagNode, interpreter);
     final TagNode finalTagNode = tagNode;
     try (
       AutoCloseableImpl<Result<String, TagCycleException>> includeStackWrapper =
@@ -165,6 +147,30 @@ public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
     }
   }
 
+  public static String resolveTemplateFile(
+    TagNode tagNode,
+    JinjavaInterpreter interpreter
+  ) {
+    HelperStringTokenizer helper = new HelperStringTokenizer(tagNode.getHelpers());
+    if (!helper.hasNext()) {
+      throw new TemplateSyntaxException(
+        tagNode.getMaster().getImage(),
+        "Tag 'include' expects template path",
+        tagNode.getLineNumber(),
+        tagNode.getStartPosition()
+      );
+    }
+
+    String path = StringUtils.trimToEmpty(helper.next());
+    String templateFile = interpreter.resolveString(
+      path,
+      tagNode.getLineNumber(),
+      tagNode.getStartPosition()
+    );
+    templateFile = interpreter.resolveResourceLocation(templateFile);
+    return templateFile;
+  }
+
   @Override
   public String getEndTagName() {
     return null;

src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerIncludeTag.java

@@ -5,8 +5,6 @@
 import com.hubspot.jinjava.lib.tag.IncludeTag;
 import com.hubspot.jinjava.tree.TagNode;
 import com.hubspot.jinjava.util.EagerReconstructionUtils;
-import com.hubspot.jinjava.util.HelperStringTokenizer;
-import org.apache.commons.lang3.StringUtils;
 
 @Beta
 public class EagerIncludeTag extends EagerTagDecorator<IncludeTag> {
@@ -17,17 +15,10 @@ public EagerIncludeTag(IncludeTag tag) {
 
   @Override
   public String innerInterpret(TagNode tagNode, JinjavaInterpreter interpreter) {
+    String templateFile = IncludeTag.resolveTemplateFile(tagNode, interpreter);
     int numDeferredTokensStart = interpreter.getContext().getDeferredTokens().size();
     String output = super.innerInterpret(tagNode, interpreter);
     if (interpreter.getContext().getDeferredTokens().size() > numDeferredTokensStart) {
-      HelperStringTokenizer helper = new HelperStringTokenizer(tagNode.getHelpers());
-      String path = StringUtils.trimToEmpty(helper.next());
-      String templateFile = interpreter.resolveString(
-        path,
-        tagNode.getLineNumber(),
-        tagNode.getStartPosition()
-      );
-      templateFile = interpreter.resolveResourceLocation(templateFile);
       return EagerReconstructionUtils.wrapPathAroundText(
         output,
         templateFile,