fix-escaping-double-quotes (#330)

* Fix escaping double quotes * Return backslashInString test
casid · Feb 10, 2024 · 1daa14b · 1daa14b
1 parent ceaa1d2
commit 1daa14b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/jte/src/main/java/gg/jte/compiler/TemplateParser.java b/jte/src/main/java/gg/jte/compiler/TemplateParser.java
@@ -190,7 +190,7 @@ private void doParse(int startingDepth) {
                 }
             } else if (currentChar == '"' && currentMode.isTrackStrings()) {
                 push(Mode.JavaCodeString);
-            } else if (currentChar == '"' && currentMode == Mode.JavaCodeString && (previousChar != '\\' || previousChar(2) == '\\')) {
+            } else if (currentChar == '"' && currentMode == Mode.JavaCodeString && (countBefore('\\') % 2 == 0)) {
                 pop();
             } else if (currentChar == '}' && currentMode == Mode.Code) {
                 pop();
@@ -364,6 +364,18 @@ private void doParse(int startingDepth) {
         }
     }
 
+    private int countBefore(char c) {
+        int count = 0;
+        for (int j = i - 1; j >= 0; --j) {
+            if (templateCode.charAt(j) == c) {
+                ++count;
+            } else {
+                break;
+            }
+        }
+        return count;
+    }
+
     @SuppressWarnings("SameParameterValue")
     private char previousChar(int offset) {
         if (i - offset < 0) {

diff --git a/jte/src/test/java/gg/jte/TemplateEngineTest.java b/jte/src/test/java/gg/jte/TemplateEngineTest.java
@@ -1035,6 +1035,12 @@ void backslashInString() {
         thenOutputIs("\\");
     }
 
+    @Test
+    void backslashAndDoubleQuoteInString() {
+        givenTemplate("${\"\\\\\\\"\\\\\"}");
+        thenOutputIs("\\\"\\");
+    }
+
     @Test
     void npe_internal() {
         givenTemplate("This is ${model.getThatThrows()} world");