Merge pull request #93 from rtts/regular-expression-literals

Fix javascript regular expression literals

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])*/",  # /[^ ]string/
         r"[{[()\]}]",
         r"var ",
         r"let ",

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

tests/suite/js.html

@@ -455,9 +455,9 @@
     foo = /([{/
     bar = /\/{/
     baz = //{//
+    xizzy = /{/
 
-    // The following is known to be broken
+    // The following is no longer broken \o/
     /function() {/
-        return
-    }
+    return
 </script>

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([])
@@ -446,10 +446,10 @@ 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 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([])