Ticket #34322: js-commented-regions.patch

django/contrib/staticfiles/storage.py

@@ -194 +194 @@
         """
         return self._url(self.stored_name, name, force)
 
-    def url_converter(self, name, hashed_files, template=None):
+    def url_converter(self, name, hashed_files, template, commented_regions):
         """
         Return the custom URL converter for the given file name.
         """
@@ -212 +212 @@
             matched = matches["matched"]
             url = matches["url"]
 
+            from bisect import bisect
+
+            if len(commented_regions):
+                m_start, m_end = span = matchobj.span()
+                comment_index = bisect(commented_regions, span)
+                if comment_index != 0:
+                    c_start, c_end = commented_regions[comment_index - 1]
+                    # If match lies within commented region
+                    if c_start <= m_start and m_end <= c_end:
+                        return matched
+
             # Ignore absolute/protocol-relative and data-uri URLs.
             if re.match(r"^[a-z]+:", url):
                 return matched
@@ -356 +367 @@
                     content = original_file.read().decode("utf-8")
                     for extension, patterns in self._patterns.items():
                         if matches_patterns(path, (extension,)):
+                            commented_regions = self._parse_commented_regions(
+                                extension, content
+                            )
                             for pattern, template in patterns:
                                 converter = self.url_converter(
-                                    name, hashed_files, template
+                                    name, hashed_files, template, commented_regions
                                 )
                                 try:
                                     content = pattern.sub(converter, content)
@@ -396 +410 @@
 
                 yield name, hashed_name, processed, substitutions
 
+    def _parse_commented_regions(self, extension, content):
+        if extension == "*.js":
+            js_region_re = re.compile(
+                r"""
+                (
+                    # single-quoted strings
+                    '([^'\\]|(\\.))*?'
+                    # double-quoted strings
+                    |"([^"\\]|(\\.))*?"
+                    # template literals
+                    |`.*?`
+                    # single line comments
+                    |//.*?\n
+                    # multi-line comments
+                    |/\*.*?\*/
+                )
+                """,
+                re.VERBOSE | re.DOTALL,
+            )
+            return [m.span() for m in js_region_re.finditer(content)]
+        else:
+            return []
+
     def clean_name(self, name):
         return name.replace("\\", "/")