Detect /{/ as regex

rtts · Mar 16, 2023 · 9a7a17b · 9a7a17b
1 parent 0ef6b75
commit 9a7a17b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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)