Merge pull request #623 from HubSpot/trim-quote-check

Trim before checking if expression is quoted
HubSpot · Mar 16, 2021 · 6b61dbf · 6b61dbf
2 parents 76efb34 + 2d835e1
commit 6b61dbf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/main/java/com/hubspot/jinjava/util/WhitespaceUtils.java b/src/main/java/com/hubspot/jinjava/util/WhitespaceUtils.java
@@ -61,7 +61,10 @@ public static boolean isExpressionQuoted(String s) {
     if (Strings.isNullOrEmpty(s)) {
       return false;
     }
-    char[] charArray = s.toCharArray();
+    char[] charArray = s.trim().toCharArray();
+    if (charArray.length == 1) {
+      return false;
+    }
     char quoteChar = 0;
     for (char c : QUOTE_CHARS) {
       if (charArray[0] == c) {

diff --git a/src/test/java/com/hubspot/jinjava/util/WhitespaceUtilsTest.java b/src/test/java/com/hubspot/jinjava/util/WhitespaceUtilsTest.java
@@ -49,4 +49,17 @@ public void itKnowsWhenAnExpressionIsQuoted() {
     assertThat(isExpressionQuoted("\"foo 'and' bar\"")).isTrue();
     assertThat(isExpressionQuoted("\"foo 'and' bar'")).isFalse();
   }
+
+  @Test
+  public void itKnowsUntrimmedExpressionIsQuoted() {
+    assertThat(isExpressionQuoted(" 'foo'")).isTrue();
+    assertThat(isExpressionQuoted("'foo' ")).isTrue();
+    assertThat(isExpressionQuoted(" 'foo' ")).isTrue();
+  }
+
+  @Test
+  public void itDoesntCountSingleQuoteChar() {
+    assertThat(isExpressionQuoted("'")).isFalse();
+    assertThat(isExpressionQuoted("\" ")).isFalse();
+  }
 }