Unwrap raw tags when evaluating set blocks

jasmith-hs · jasmith-hs · commit b076e279b9b0 · 2023-06-09T11:34:42.000-04:00
diff --git a/src/main/java/com/hubspot/jinjava/lib/tag/SetTag.java b/src/main/java/com/hubspot/jinjava/lib/tag/SetTag.java
@@ -19,6 +19,7 @@
 import com.hubspot.jinjava.doc.annotations.JinjavaParam;
 import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
 import com.hubspot.jinjava.doc.annotations.JinjavaTextMateSnippet;
+import com.hubspot.jinjava.interpret.Context.TemporaryValueClosable;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.DeferredValueException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -167,8 +168,12 @@ public static String renderChildren(
   private static String renderChildren(TagNode tagNode, JinjavaInterpreter interpreter) {
     String result;
     StringBuilder sb = new StringBuilder();
-    for (Node child : tagNode.getChildren()) {
-      sb.append(child.render(interpreter));
+    try (
+      TemporaryValueClosable<Boolean> c = interpreter.getContext().withUnwrapRawOverride()
+    ) {
+      for (Node child : tagNode.getChildren()) {
+        sb.append(child.render(interpreter));
+      }
     }
     result = sb.toString();
     return result;
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerSetTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerSetTagTest.java
@@ -218,6 +218,13 @@ public void itDefersInDeferredExecutionModeWithFilter() {
     assertThat(interpreter.render(result)).isEqualTo(interpreter.render(template)); // 1 + 2 + 2 = 5
   }
 
+  @Test
+  public void itUnwrapsRawTags() {
+    String template = "{% set foo %}{% raw %}{%{% endraw %}{% endset %}";
+    interpreter.render(template);
+    assertThat(interpreter.getContext().get("foo")).isEqualTo("{%");
+  }
+
   @Test
   @Override
   @Ignore
