Revert "#308 fix for backtick in comment within content block"

This reverts commit 0c83398.
casid · Jan 27, 2024 · 818beb7 · 818beb7
1 parent 6500412
commit 818beb7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 24 deletions.
diff --git a/jte/src/main/java/gg/jte/compiler/ContentProcessor.java b/jte/src/main/java/gg/jte/compiler/ContentProcessor.java
@@ -43,10 +43,6 @@ public void process() {
             push(Mode.Raw);
          } else if (regionMatches("@endraw") && currentMode == Mode.Raw) {
             pop();
-         } else if (regionMatches("<%--") && currentMode == Mode.Content) {
-            push(Mode.Comment);
-         } else if (regionMatches("--%>") && currentMode == Mode.Comment) {
-            pop();
          }
       }
 
@@ -83,7 +79,6 @@ private enum Mode {
       Code,
       Content,
       Raw,
-      Comment,
       ;
 
       boolean isContentBlockAllowed() {

diff --git a/jte/src/main/java/gg/jte/compiler/TemplateParser.java b/jte/src/main/java/gg/jte/compiler/TemplateParser.java
@@ -148,9 +148,7 @@ private void doParse(int startingDepth) {
             } else if (currentMode == Mode.Comment) {
                 if (regionMatches("--%>")) {
                     pop();
-                    if (currentMode == Mode.Text) {
-                        lastIndex = i + 1;
-                    }
+                    lastIndex = i + 1;
                 }
             } else if (currentMode == Mode.HtmlComment) {
                 if (regionMatches("-->")) {
@@ -405,7 +403,7 @@ private int getCurrentTemplateLine() {
     }
 
     private boolean isCommentAllowed() {
-        return currentMode == Mode.Text || currentMode == Mode.Content;
+        return currentMode == Mode.Text;
     }
 
     private boolean isParamOrImportAllowed() {
@@ -623,9 +621,7 @@ private void extractHtmlCodePart() {
 
     private void extractComment(Mode mode, int startIndex) {
         if (paramsComplete || areParamsComplete(startIndex)) {
-            if (currentMode == Mode.Text) {
-                extractTextPart(startIndex, mode);
-            }
+            extractTextPart(startIndex, mode);
         }
         push(mode);
     }

diff --git a/jte/src/test/java/gg/jte/TemplateEngineTest.java b/jte/src/test/java/gg/jte/TemplateEngineTest.java
@@ -791,18 +791,6 @@ void htmlCommentInPlainTemplate() {
         thenOutputIs("Hello<!--This is an HTML comment--> World");
     }
 
-    @Test
-    void commentWithBacktickInContentBlock() {
-        givenTemplate("""
-              !{var content = @`<%--`--%>Hello there!`;}
-              ${content}
-              """);
-        thenOutputIs("""
-              
-              Hello there!
-              """);
-    }
-
     @Test
     void importInCss() {
         givenTemplate("<style type=\"text/css\" rel=\"stylesheet\" media=\"all\">\n" +