From 0ef6b75486b0c73305795bac1f4c745cb448ac30 Mon Sep 17 00:00:00 2001
From: Jaap Joris Vens <jj@rtts.eu>
Date: Tue, 14 Mar 2023 21:25:39 +0100
Subject: [PATCH 1/2] Fix javascript regular expression literals

---
 djhtml/modes.py       | 8 ++++----
 setup.cfg             | 2 +-
 tests/suite/js.html   | 5 ++---
 tests/suite/js.tokens | 9 ++++-----
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/djhtml/modes.py b/djhtml/modes.py
index 02a7744..72ae4a0 100644
--- a/djhtml/modes.py
+++ b/djhtml/modes.py
@@ -385,10 +385,10 @@ class DjJS(DjTXT):
         r"//.*",
         r"/\*",
         r"[$\w-]+:",
-        r'"(?:\\.|[^\\"])*"',  # "string"
-        r"'(?:\\.|[^\\'])*'",  # 'string'
-        r"`(?:\\.|[^\\`])*`",  # `string`
-        r"/(?:\\.|[^\\/ \n])*/",  # /string/ (but without spaces)
+        r'"(?:\\.|[^"])*"',  # "string"
+        r"'(?:\\.|[^'])*'",  # 'string'
+        r"`(?:\\.|[^`])*`",  # `string`
+        r"/(?:\\.|[^ /\n])(?:\\.|[^/\n])*(?:\\.|[^ /\n])/",  # /string/
         r"[{[()\]}]",
         r"var ",
         r"let ",
diff --git a/setup.cfg b/setup.cfg
index 2f1049d..73a41d8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = djhtml
-version = 3.0.5
+version = 3.0.6
 description = Django/Jinja template indenter
 long_description = file: README.md
 long_description_content_type = text/markdown
diff --git a/tests/suite/js.html b/tests/suite/js.html
index 74c3650..60cd36e 100644
--- a/tests/suite/js.html
+++ b/tests/suite/js.html
@@ -456,8 +456,7 @@
     bar = /\/{/
     baz = //{//
 
-    // The following is known to be broken
+    // The following is no longer broken \o/
     /function() {/
-        return
-    }
+    return
 </script>
diff --git a/tests/suite/js.tokens b/tests/suite/js.tokens
index b88effa..c4adaa2 100644
--- a/tests/suite/js.tokens
+++ b/tests/suite/js.tokens
@@ -433,7 +433,7 @@ Line([Open('<!--', mode=DjHTML, ignore=True), Text(' Expression literals ', mode
 Line([Text('<', mode=DjHTML), Text('script', mode=InsideHTMLTag, absolute=8), Open('>', mode=DjHTML)])
 Line([Text('    re = ', mode=DjJS), Text('/ab+c/', mode=DjJS, relative=1)], level=1)
 Line([Text('    space_re = / foo /', mode=DjJS)], level=1)
-Line([Text('    single_re = /foo\\/ + bar/', mode=DjJS)], level=1)
+Line([Text('    single_re = ', mode=DjJS), Text('/foo\\/ + bar/', mode=DjJS, relative=1)], level=1)
 Line([Text('    double_re = ', mode=DjJS), Text('/foo/', mode=DjJS, relative=1), Text(' + ', mode=DjJS), Text('/bar/', mode=DjJS)], level=1)
 Line([Text('    looks_like_comment = ', mode=DjJS), Text('/\\(/', mode=DjJS, relative=1), Text('/', mode=DjJS)], level=1)
 Line([])
@@ -447,9 +447,8 @@ Line([Text('    foo = ', mode=DjJS), Text('/([{/', mode=DjJS, relative=1)], leve
 Line([Text('    bar = ', mode=DjJS), Text('/\\/{/', mode=DjJS, relative=1)], level=1)
 Line([Text('    baz = ', mode=DjJS), Text('//{//', mode=DjJS, ignore=True)], level=1)
 Line([])
-Line([Text('    ', mode=DjJS), Text('// The following is known to be broken', mode=DjJS, ignore=True)], level=1, ignore=True)
-Line([Text('    /function', mode=DjJS), Open('(', mode=DjJS, level=1), Close(')', mode=DjJS), Text(' ', mode=DjJS), Open('{', mode=DjJS, level=1), Text('/', mode=DjJS)], level=1)
-Line([Text('        return', mode=DjJS)], level=2)
-Line([Text('    ', mode=DjJS), Close('}', mode=DjJS)], level=1)
+Line([Text('    ', mode=DjJS), Text('// The following is no longer broken \\o/', mode=DjJS, ignore=True)], level=1, ignore=True)
+Line([Text('    ', mode=DjJS), Text('/function() {/', mode=DjJS)], level=1)
+Line([Text('    return', mode=DjJS)], level=1)
 Line([Close('</script>', mode=DjHTML)])
 Line([])
\ No newline at end of file

From 9a7a17b9474bce165d251dcecefe2e37175de6a5 Mon Sep 17 00:00:00 2001
From: Jaap Joris Vens <jj@rtts.eu>
Date: Thu, 16 Mar 2023 22:43:08 +0100
Subject: [PATCH 2/2] Detect `/{/` as regex

---
 djhtml/modes.py       | 2 +-
 tests/suite/js.html   | 1 +
 tests/suite/js.tokens | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/djhtml/modes.py b/djhtml/modes.py
index 72ae4a0..9b9e655 100644
--- a/djhtml/modes.py
+++ b/djhtml/modes.py
@@ -388,7 +388,7 @@ class DjJS(DjTXT):
         r'"(?:\\.|[^"])*"',  # "string"
         r"'(?:\\.|[^'])*'",  # 'string'
         r"`(?:\\.|[^`])*`",  # `string`
-        r"/(?:\\.|[^ /\n])(?:\\.|[^/\n])*(?:\\.|[^ /\n])/",  # /string/
+        r"/(?=[^ ])(?:\\.|[^/\n])*/",  # /[^ ]string/
         r"[{[()\]}]",
         r"var ",
         r"let ",
diff --git a/tests/suite/js.html b/tests/suite/js.html
index 60cd36e..c8f0c6a 100644
--- a/tests/suite/js.html
+++ b/tests/suite/js.html
@@ -455,6 +455,7 @@
     foo = /([{/
     bar = /\/{/
     baz = //{//
+    xizzy = /{/
 
     // The following is no longer broken \o/
     /function() {/
diff --git a/tests/suite/js.tokens b/tests/suite/js.tokens
index c4adaa2..783a19d 100644
--- a/tests/suite/js.tokens
+++ b/tests/suite/js.tokens
@@ -446,6 +446,7 @@ Line([])
 Line([Text('    foo = ', mode=DjJS), Text('/([{/', mode=DjJS, relative=1)], level=1)
 Line([Text('    bar = ', mode=DjJS), Text('/\\/{/', mode=DjJS, relative=1)], level=1)
 Line([Text('    baz = ', mode=DjJS), Text('//{//', mode=DjJS, ignore=True)], level=1)
+Line([Text('    xizzy = ', mode=DjJS), Text('/{/', mode=DjJS, relative=1)], level=1)
 Line([])
 Line([Text('    ', mode=DjJS), Text('// The following is no longer broken \\o/', mode=DjJS, ignore=True)], level=1, ignore=True)
 Line([Text('    ', mode=DjJS), Text('/function() {/', mode=DjJS)], level=1)