Use commitSpeculativeBindings method everywhere for consistency

Author: jasmith-hs

src/main/java/com/hubspot/jinjava/lib/expression/EagerExpressionStrategy.java

@@ -56,7 +56,10 @@ private String eagerResolveExpression(
     ) {
       prefixToPreserveState.putAll(eagerExecutionResult.getPrefixToPreserveState());
     } else {
-      interpreter.getContext().putAll(eagerExecutionResult.getSpeculativeBindings());
+      EagerReconstructionUtils.commitSpeculativeBindings(
+        interpreter,
+        eagerExecutionResult
+      );
     }
     if (eagerExecutionResult.getResult().isFullyResolved()) {
       String result = eagerExecutionResult.getResult().toString(true);

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

@@ -74,7 +74,10 @@ public String eagerInterpret(
       ) {
         prefixToPreserveState.putAll(eagerExecutionResult.getPrefixToPreserveState());
       } else {
-        interpreter.getContext().putAll(eagerExecutionResult.getSpeculativeBindings());
+        EagerReconstructionUtils.commitSpeculativeBindings(
+          interpreter,
+          eagerExecutionResult
+        );
       }
       if (eagerExecutionResult.getResult().isFullyResolved()) {
         // Possible macro/set tag in front of this one.

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

@@ -64,7 +64,10 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
     ) {
       prefixToPreserveState.putAll(eagerExecutionResult.getPrefixToPreserveState());
     } else {
-      interpreter.getContext().putAll(eagerExecutionResult.getSpeculativeBindings());
+      EagerReconstructionUtils.commitSpeculativeBindings(
+        interpreter,
+        eagerExecutionResult
+      );
     }
     String resolvedExpression;
     List<String> resolvedValues; // can only be retrieved if the EagerExpressionResult are fully resolved.

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

@@ -71,7 +71,10 @@ public static String interpretExpression(
     ) {
       prefixToPreserveState.putAll(eagerExecutionResult.getPrefixToPreserveState());
     } else {
-      interpreter.getContext().putAll(eagerExecutionResult.getSpeculativeBindings());
+      EagerReconstructionUtils.commitSpeculativeBindings(
+        interpreter,
+        eagerExecutionResult
+      );
     }
     if (eagerExecutionResult.getResult().isFullyResolved()) {
       // Possible macro/set tag in front of this one.

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

@@ -54,7 +54,10 @@ public String run(TagNode tagNode, JinjavaInterpreter interpreter) {
       eagerExecutionResult.getResult().isFullyResolved() &&
       !interpreter.getContext().isDeferredExecutionMode()
     ) {
-      interpreter.getContext().putAll(eagerExecutionResult.getSpeculativeBindings());
+      EagerReconstructionUtils.commitSpeculativeBindings(
+        interpreter,
+        eagerExecutionResult
+      );
       Optional<String> maybeResolved = resolveSet(
         tagNode,
         variables,
@@ -128,7 +131,10 @@ protected PrefixToPreserveState getPrefixToPreserveState(
     ) {
       prefixToPreserveState.putAll(eagerExecutionResult.getPrefixToPreserveState());
     } else {
-      interpreter.getContext().putAll(eagerExecutionResult.getSpeculativeBindings());
+      EagerReconstructionUtils.commitSpeculativeBindings(
+        interpreter,
+        eagerExecutionResult
+      );
     }
     prefixToPreserveState.putAll(
       EagerReconstructionUtils.reconstructFromContextBeforeDeferringAsMap(

src/main/java/com/hubspot/jinjava/util/EagerReconstructionUtils.java

@@ -782,6 +782,8 @@ public static void commitSpeculativeBindings(
       .getSpeculativeBindings()
       .entrySet()
       .stream()
+      // Filter DeferredValueShadow because these are just used to mark that a value became deferred within this scope
+      // The original key will be a DeferredValueImpl already on its original scope
       .filter(entry -> !(entry.getValue() instanceof DeferredValueShadow))
       .forEach(entry -> interpreter.getContext().put(entry.getKey(), entry.getValue()));
   }