Merge pull request #760 from bhreinb/Add_Current_Processed_Node_In_Th…

…e_Context Track Current Processed Node In The Context
HubSpot · Oct 11, 2021 · dc51986 · dc51986
2 parents ca99246 + bf4e191
commit dc51986
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/src/main/java/com/hubspot/jinjava/interpret/Context.java b/src/main/java/com/hubspot/jinjava/interpret/Context.java
@@ -111,6 +111,7 @@ public enum Library {
   private boolean unwrapRawOverride = false;
   private DynamicVariableResolver dynamicVariableResolver = null;
   private final Set<String> metaContextVariables; // These variable names aren't tracked in eager execution
+  private Node currentNode;
 
   public Context() {
     this(null, null, null, true);
@@ -732,4 +733,12 @@ public void close() {
       resetValueConsumer.accept(previousValue);
     }
   }
+
+  public Node getCurrentNode() {
+    return currentNode;
+  }
+
+  public void setCurrentNode(final Node currentNode) {
+    this.currentNode = currentNode;
+  }
 }
diff --git a/src/main/java/com/hubspot/jinjava/tree/ExpressionNode.java b/src/main/java/com/hubspot/jinjava/tree/ExpressionNode.java
@@ -43,6 +43,7 @@ public ExpressionNode(ExpressionStrategy expressionStrategy, ExpressionToken tok
 
   @Override
   public OutputNode render(JinjavaInterpreter interpreter) {
+    interpreter.getContext().setCurrentNode(this);
     try {
       return expressionStrategy.interpretOutput(master, interpreter);
     } catch (DeferredValueException e) {

diff --git a/src/main/java/com/hubspot/jinjava/tree/TagNode.java b/src/main/java/com/hubspot/jinjava/tree/TagNode.java
@@ -44,6 +44,7 @@ public TagNode(Tag tag, TagToken token, TokenScannerSymbols symbols) {
 
   @Override
   public OutputNode render(JinjavaInterpreter interpreter) {
+    interpreter.getContext().setCurrentNode(this);
     if (
       interpreter.getContext().isValidationMode() && !tag.isRenderedInValidationMode()
     ) {

diff --git a/src/main/java/com/hubspot/jinjava/tree/TextNode.java b/src/main/java/com/hubspot/jinjava/tree/TextNode.java
@@ -32,6 +32,7 @@ public TextNode(TextToken token) {
 
   @Override
   public OutputNode render(JinjavaInterpreter interpreter) {
+    interpreter.getContext().setCurrentNode(this);
     return new RenderedOutputNode(
       interpreter.getContext().isValidationMode() ? "" : master.output()
     );