Simplify to also handle '' quickly

jasmith-hs · jasmith-hs · commit 2d835e1e5505 · 2021-03-16T15:35:57.000-04:00
diff --git a/src/main/java/com/hubspot/jinjava/util/WhitespaceUtils.java b/src/main/java/com/hubspot/jinjava/util/WhitespaceUtils.java
@@ -62,6 +62,9 @@ public static boolean isExpressionQuoted(String s) {
       return false;
     }
     char[] charArray = s.trim().toCharArray();
+    if (charArray.length == 1) {
+      return false;
+    }
     char quoteChar = 0;
     for (char c : QUOTE_CHARS) {
       if (charArray[0] == c) {
@@ -79,12 +82,12 @@ public static boolean isExpressionQuoted(String s) {
       }
       if (prevChar == '\\') {
         // Double escapes cancel out.
-        prevChar = 1;
+        prevChar = 0;
       } else {
         prevChar = charArray[i];
       }
     }
-    return prevChar != '\\' && prevChar != 0;
+    return prevChar != '\\';
   }
 
   public static String unquote(String s) {

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,9 @@ public static boolean isExpressionQuoted(String s) {`
`62`	`62`	`return false;`
`63`	`63`	`}`
`64`	`64`	`char[] charArray = s.trim().toCharArray();`
	`65`	`+ if (charArray.length == 1) {`
	`66`	`+ return false;`
	`67`	`+ }`
`65`	`68`	`char quoteChar = 0;`
`66`	`69`	`for (char c : QUOTE_CHARS) {`
`67`	`70`	`if (charArray[0] == c) {`
`@@ -79,12 +82,12 @@ public static boolean isExpressionQuoted(String s) {`
`79`	`82`	`}`
`80`	`83`	`if (prevChar == '\\') {`
`81`	`84`	`// Double escapes cancel out.`
`82`		`- prevChar = 1;`
	`85`	`+ prevChar = 0;`
`83`	`86`	`} else {`
`84`	`87`	`prevChar = charArray[i];`
`85`	`88`	`}`
`86`	`89`	`}`
`87`		`- return prevChar != '\\' && prevChar != 0;`
	`90`	`+ return prevChar != '\\';`
`88`	`91`	`}`
`89`	`92`
`90`	`93`	`public static String unquote(String s) {`