Merge pull request #91 from rtts/css-urls

Don't treat `//` inside URL as comment
rtts · Mar 9, 2023 · 04edbe9 · 04edbe9
2 parents 5505a1a + 541247c
commit 04edbe9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/djhtml/modes.py b/djhtml/modes.py
@@ -330,14 +330,15 @@ class DjCSS(DjTXT):
     """
 
     RAW_TOKENS = DjTXT.RAW_TOKENS + [
-        r"</style>",
+        r"://",
         r"//.*",
         r"[{()}]",
         r"/\*",
         r'"(?:\\.|[^\\"])*"',  # "string"
         r"'(?:\\.|[^\\'])*'",  # 'string'
         r"[\w-]+: ",
         r";",
+        r"</style>",
     ]
 
     def create_token(self, raw_token, src, line):

diff --git a/tests/suite/css.html b/tests/suite/css.html
@@ -201,6 +201,7 @@
     div {
         foo: bar; // comment: ignore
         font-weight: bold;
+        background: url(http://not.a.comment);
     }
 </style>
 

diff --git a/tests/suite/css.tokens b/tests/suite/css.tokens
@@ -201,6 +201,7 @@ Line([Text('<', mode=DjHTML), Text('style', mode=InsideHTMLTag, absolute=7), Ope
 Line([Text('    div ', mode=DjCSS), Open('{', mode=DjCSS, level=1)], level=1)
 Line([Text('        ', mode=DjCSS), Text('foo: ', mode=DjCSS), Text('bar', mode=DjCSS, absolute=5), Text(';', mode=DjCSS), Text(' ', mode=DjCSS), Text('// comment: ignore', mode=DjCSS, ignore=True)], level=2)
 Line([Text('        ', mode=DjCSS), Text('font-weight: ', mode=DjCSS), Text('bold', mode=DjCSS, absolute=13), Text(';', mode=DjCSS)], level=2)
+Line([Text('        ', mode=DjCSS), Text('background: ', mode=DjCSS), Text('url', mode=DjCSS, absolute=12), Open('(', mode=DjCSS, level=2), Text('http', mode=DjCSS), Text('://', mode=DjCSS), Text('not.a.comment', mode=DjCSS), Close(')', mode=DjCSS), Text(';', mode=DjCSS)], level=2)
 Line([Text('    ', mode=DjCSS), Close('}', mode=DjCSS)], level=1)
 Line([Close('</style>', mode=DjHTML)])
 Line([])