Add tests for multiple nested expressions and fix escaping

jasmith-hs · jasmith-hs · commit f56f94e0caa9 · 2022-11-22T12:19:42.000-05:00
diff --git a/src/main/java/com/hubspot/jinjava/util/EagerExpressionResolver.java b/src/main/java/com/hubspot/jinjava/util/EagerExpressionResolver.java
@@ -133,7 +133,7 @@ private static Set<String> findDeferredWords(
       interpreter.getContext().setThrowInterpreterErrors(true);
       Set<String> words = new HashSet<>();
       char[] value = partiallyResolved.toCharArray();
-      int prevQuotePos = 0;
+      int prevQuotePos = -1;
       int curPos = 0;
       char c;
       char prevChar = 0;
@@ -143,13 +143,12 @@ private static Set<String> findDeferredWords(
         c = value[curPos];
         if (inQuote) {
           if (c == quoteChar && prevChar != '\\') {
-            String quoted = partiallyResolved.substring(prevQuotePos, curPos);
             if (nestedInterpretationEnabled) {
               getDeferredWordsInsideNestedExpression(
                 interpreter,
                 scannerSymbols,
                 words,
-                quoted
+                partiallyResolved.substring(prevQuotePos, curPos + 1)
               );
             }
             inQuote = false;
@@ -161,17 +160,23 @@ private static Set<String> findDeferredWords(
           words.addAll(
             findDeferredWordsInSubstring(
               partiallyResolved,
-              prevQuotePos,
+              prevQuotePos + 1,
               curPos,
               interpreter
             )
           );
+          prevQuotePos = curPos;
         }
         prevChar = c;
         curPos++;
       }
       words.addAll(
-        findDeferredWordsInSubstring(partiallyResolved, prevQuotePos, curPos, interpreter)
+        findDeferredWordsInSubstring(
+          partiallyResolved,
+          prevQuotePos + 1,
+          curPos,
+          interpreter
+        )
       );
       return words;
     } finally {
@@ -198,7 +203,10 @@ private static void getDeferredWordsInsideNestedExpression(
       quoted.contains(scannerSymbols.getExpressionStart()) &&
       quoted.contains(scannerSymbols.getExpressionEnd())
     ) {
-      List<ExpressionNode> expressionNodes = getExpressionNodes(quoted, interpreter);
+      List<ExpressionNode> expressionNodes = getExpressionNodes(
+        WhitespaceUtils.unquoteAndUnescape(quoted),
+        interpreter
+      );
       words.addAll(
         expressionNodes
           .stream()
diff --git a/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java b/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java
@@ -630,7 +630,6 @@ public void itHandlesDeferredChoice() {
 
   @Test
   public void itGetsDeferredWordsFromNestedExpression() {
-    context.put("foo", 4);
     EagerExpressionResult eagerExpressionResult = eagerResolveExpression(
       "deferred.append('{{ foo }}')"
     );
@@ -641,6 +640,31 @@ public void itGetsDeferredWordsFromNestedExpression() {
       .containsExactlyInAnyOrder("deferred.append", "foo");
   }
 
+  @Test
+  public void itGetsDeferredWordsFromAdjacentNestedExpression() {
+    EagerExpressionResult eagerExpressionResult = eagerResolveExpression(
+      "deferred.append('{{ foo }} and {{ bar }}')"
+    );
+    interpreter.getContext().setThrowInterpreterErrors(true);
+    String partiallyResolved = eagerExpressionResult.toString();
+    assertThat(partiallyResolved).isEqualTo("deferred.append('{{ foo }} and {{ bar }}')");
+    assertThat(eagerExpressionResult.getDeferredWords())
+      .containsExactlyInAnyOrder("deferred.append", "foo", "bar");
+  }
+
+  @Test
+  public void itGetsDeferredWordsFromMultipleNestedExpression() {
+    EagerExpressionResult eagerExpressionResult = eagerResolveExpression(
+      "deferred.append('{{ foo ~ \\'and {{ bar }}\\' }}')"
+    );
+    interpreter.getContext().setThrowInterpreterErrors(true);
+    String partiallyResolved = eagerExpressionResult.toString();
+    assertThat(partiallyResolved)
+      .isEqualTo("deferred.append('{{ foo ~ \\'and {{ bar }}\\' }}')");
+    assertThat(eagerExpressionResult.getDeferredWords())
+      .containsExactlyInAnyOrder("deferred.append", "foo", "bar");
+  }
+
   @Test
   public void itHandlesDeferredNamedParameter() {
     context.put("foo", "foo");
