Separate redirect regex into seperate states

pygments · Apr 1, 2023 · f78ee09 · f78ee09
1 parent 4fe3ce9
commit f78ee09
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/pygments/lexers/markup.py b/pygments/lexers/markup.py
@@ -951,18 +951,10 @@ def handle_score(self, match):
         'root': [
             # Redirects
             (r"""(?x)
-                (\A\s*?)
-                (\#REDIRECT:?) # may contain a colon
-                (\s+)
-                (\[\[)
-                    ([{}]+?)
-                    (?: (\#)([^#]*?) )?
-                    (?: (\|)([^\n|]*) )?
-                (\]\])
-                (\s*?\n)
-            """.format(title_char),
-             bygroups(Whitespace, Keyword, Whitespace, Punctuation, Name.Tag, Punctuation, Name.Label,
-                      Punctuation, Text, Punctuation, Whitespace)),
+                (\A\s*?)(\#REDIRECT:?) # may contain a colon
+                (\s+)(\[\[) (?=[^\]\n]* \]\]$)
+            """,
+             bygroups(Whitespace, Keyword, Whitespace, Punctuation), 'redirect-inner'),
             # Subheadings
             (r'^(={2,6})(.+?)(\1)(\s*$\n)',
              bygroups(Generic.Subheading, Generic.Subheading, Generic.Subheading, Whitespace)),
@@ -976,18 +968,23 @@ def handle_score(self, match):
             (r'\b(?:{}){}{}*'.format('|'.join(protocols),
              link_address, link_char_class), Name.Label),
             # Magic links
+            (r'(?-i:\b(?:RFC|PMID){}+[0-9]+\b)'.format(nbsp_char),
+             Name.Function.Magic),
             (r"""(?x-i:
-                \b(?:RFC|PMID) {nbsp_char}+ [0-9]+\b
-                |
                 \bISBN {nbsp_char}
                 (?: 97[89] {nbsp_dash}? )?
-                (?: [0-9] {nbsp_dash}? ){{9}}
+                (?: [0-9] {nbsp_dash}? ){{9}} # escape format()
                 [0-9Xx]\b
             )""".format(nbsp_char=nbsp_char, nbsp_dash=f'(?:-|{nbsp_char})'), Name.Function.Magic),
             include('list'),
             include('inline'),
             include('text'),
         ],
+        'redirect-inner': [
+            (r'(\]\])(\s*?\n)', bygroups(Punctuation, Whitespace), '#pop'),
+            (r'(\#)([^#]*?)', bygroups(Punctuation, Name.Label)),
+            (r'[{}]+'.format(title_char), Name.Tag),
+        ],
         'list': [
             # Description lists
             (r'^;', Keyword, 'dt'),