Update tags to use ImportTag.parseTemplateAsNode

Author: Maple Buice

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

@@ -85,25 +85,20 @@ public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
       Map<String, String> imports = getImportMap(helper);
 
       try {
-        interpreter
-          .getContext()
-          .getCurrentPathStack()
-          .push(templateFile, tagNode.getLineNumber(), tagNode.getStartPosition());
-
-        String template = interpreter.getResource(templateFile);
-        Node node = interpreter.parse(template);
+        Node node = ImportTag.parseTemplateAsNode(interpreter, templateFile);
 
         JinjavaInterpreter child = interpreter
           .getConfig()
           .getInterpreterFactory()
           .newInstance(interpreter);
         child.getContext().put(Context.IMPORT_RESOURCE_PATH_KEY, templateFile);
+
         JinjavaInterpreter.pushCurrent(child);
+
         try {
           child.render(node);
         } finally {
           JinjavaInterpreter.popCurrent();
-          interpreter.getContext().getCurrentPathStack().pop();
         }
 
         interpreter.addAllChildErrors(templateFile, child.getErrorsCopy());
@@ -130,7 +125,8 @@ public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
         );
       }
     } finally {
-      interpreter.getContext().popFromStack();
+      interpreter.getContext().getCurrentPathStack().pop();
+      interpreter.getContext().getImportPathStack().pop();
     }
   }
 

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

@@ -9,6 +9,7 @@
 import com.hubspot.jinjava.lib.fn.eager.EagerMacroFunction;
 import com.hubspot.jinjava.lib.tag.DoTag;
 import com.hubspot.jinjava.lib.tag.FromTag;
+import com.hubspot.jinjava.lib.tag.ImportTag;
 import com.hubspot.jinjava.lib.tag.eager.importing.EagerImportingStrategyFactory;
 import com.hubspot.jinjava.tree.Node;
 import com.hubspot.jinjava.tree.parse.TagToken;
@@ -81,13 +82,7 @@ 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);
+        Node node = ImportTag.parseTemplateAsNode(interpreter, templateFile);
 
         JinjavaInterpreter child = interpreter
           .getConfig()
@@ -100,7 +95,6 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
           output = child.render(node);
         } finally {
           JinjavaInterpreter.popCurrent();
-          interpreter.getContext().getCurrentPathStack().pop();
         }
 
         interpreter.addAllChildErrors(templateFile, child.getErrorsCopy());
@@ -143,7 +137,8 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
         );
       }
     } finally {
-      interpreter.getContext().popFromStack();
+      interpreter.getContext().getCurrentPathStack().pop();
+      interpreter.getContext().getImportPathStack().pop();
     }
   }