Ignore special characters embedded in Javascript strings

rtts · May 16, 2021 · 30f2e51 · 30f2e51
1 parent 1bbd290
commit 30f2e51
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/djhtml/modes.py b/djhtml/modes.py
@@ -282,9 +282,10 @@ class DjJS(Mode):
 
     """
 
+    STRING = r"[\"'`].*?[\"'`]"
     BRACES = r"[\{\[\(\)\]\}]"
     COMMENT = DjCSS.COMMENT
-    TOKEN = re.compile(Mode.TOKEN.pattern + f"|({BRACES})|({COMMENT})")
+    TOKEN = re.compile(Mode.TOKEN.pattern + f"|({STRING})|({BRACES})|({COMMENT})")
 
     def indent(self, tabwidth, level=0):
         lines = self.tokenize(tabwidth, level)
@@ -301,6 +302,12 @@ def get_token_type(self, raw_token):
             return Token.Open
         if raw_token in "}])":
             return Token.Close
+        if raw_token.startswith(("'", '"')):
+            return Token.Text
+        if raw_token.startswith("`"):
+            if "\n" in raw_token:
+                return Comment
+            return Token.Text
         if raw_token.startswith("/*"):
             if "\n" in raw_token:
                 return Comment

diff --git a/tests/suite/js.in b/tests/suite/js.in
@@ -60,3 +60,16 @@ doStuff();
      *
      */
 </script>
+
+
+<!-- Nasty characters embedded in strings -->
+<script>
+console.log("$(function() {");
+console.log('$(function() {');
+console.log(`$(function() {`);
+console.log(`
+function f() {
+return 42;
+}
+`);
+</script>
diff --git a/tests/suite/js.out b/tests/suite/js.out
@@ -60,3 +60,16 @@
      *
      */
 </script>
+
+
+<!-- Nasty characters embedded in strings -->
+<script>
+    console.log("$(function() {");
+    console.log('$(function() {');
+    console.log(`$(function() {`);
+    console.log(`
+function f() {
+return 42;
+}
+    `);
+</script>