fix syntax highlighting when line ends in slash

Author: TheLizzard

Lib/idlelib/colorizer.py

@@ -17,6 +17,7 @@ def any(name, alternates):
 def make_pat():
     kw = r"\b" + any("KEYWORD", keyword.kwlist) + r"\b"
     match_softkw = (
+        r"(?<!\\\n)" +  # last line doesn't end in slash
         r"^[ \t]*" +  # at beginning of line + possible indentation
         r"(?P<MATCH_SOFTKW>match)\b" +
         r"(?![ \t]*(?:" + "|".join([  # not followed by ...
@@ -27,11 +28,13 @@ def make_pat():
         r"))"
     )
     case_default = (
+        r"(?<!\\\n)" +  # last line doesn't end in slash
         r"^[ \t]*" +  # at beginning of line + possible indentation
         r"(?P<CASE_SOFTKW>case)" +
         r"[ \t]+(?P<CASE_DEFAULT_UNDERSCORE>_\b)"
     )
     case_softkw_and_pattern = (
+        r"(?<!\\\n)" +  # last line doesn't end in slash
         r"^[ \t]*" +  # at beginning of line + possible indentation
         r"(?P<CASE_SOFTKW2>case)\b" +
         r"(?![ \t]*(?:" + "|".join([  # not followed by ...
@@ -45,19 +48,43 @@ def make_pat():
     builtinlist = [str(name) for name in dir(builtins)
                    if not name.startswith('_') and
                    name not in keyword.kwlist]
-    builtin = r"([^.'\"\\#]\b|^)" + any("BUILTIN", builtinlist) + r"\b"
+    builtin = (
+        r"(?<!" +  # make sure there isn't
+            r"\\\n" +  # a slash followed by a newline
+        r")" +
+        r"(?<!" +  # make sure that there also isn't
+            r"|".join([
+                r"\.",  # a dot or
+                r" ",   # a space
+            ]) +
+        r")" +
+        r"(" +  # match any number of
+            r"[ \t]*" +     # spaces/tabs followed by
+            r"(\\\\)*\\" +  # an odd number of slashes followed by
+            r"\n" +         # a newline
+        r")*" +
+        r"(" +  # also match
+            r"|".join([  # either
+                r"[ \t]+",  # indentation or
+                r"\b",      # a word boundary
+            ]) +
+        r")" +
+        any("BUILTIN", builtinlist) +  # followed by a builtin
+        r"\b"  # followed by another word boundary
+    )
     comment = any("COMMENT", [r"#[^\n]*"])
     stringprefix = r"(?i:r|u|f|fr|rf|b|br|rb|t|rt|tr)?"
     sqstring = stringprefix + r"'[^'\\\n]*(\\.[^'\\\n]*)*'?"
     dqstring = stringprefix + r'"[^"\\\n]*(\\.[^"\\\n]*)*"?'
     sq3string = stringprefix + r"'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?"
     dq3string = stringprefix + r'"""[^"\\]*((\\.|"(?!""))[^"\\]*)*(""")?'
     string = any("STRING", [sq3string, dq3string, sqstring, dqstring])
+    sync = any("SYNC", [r"(?<!\\)\n"])  #  no sync if line ends with slash
     prog = re.compile("|".join([
                                 builtin, comment, string, kw,
                                 match_softkw, case_default,
                                 case_softkw_and_pattern,
-                                any("SYNC", [r"\n"]),
+                                sync,
                                ]),
                       re.DOTALL | re.MULTILINE)
     return prog

Lib/idlelib/idle_test/test_colorizer.py

@@ -52,6 +52,12 @@ async def f(): await g()
     '''
     case _:'''
     "match x:"
+    self. \\
+        set
+    f(self, \\
+        set())
+    x = match if match else \\
+            match
     """)
 
 
@@ -404,6 +410,7 @@ def test_recolorize_main(self, mock_notify):
                     ('28.25', ('STRING',)), ('28.38', ('STRING',)),
                     ('30.0', ('STRING',)),
                     ('31.1', ('STRING',)),
+                    ('33.4', ()), ('35.4', ("BUILTIN",)), ('37.8', ()),
                     # SYNC at the end of every line.
                     ('1.55', ('SYNC',)), ('2.50', ('SYNC',)), ('3.34', ('SYNC',)),
                    )
@@ -434,7 +441,11 @@ def test_recolorize_main(self, mock_notify):
         eq(text.tag_nextrange('STRING', '8.12'), ('8.14', '8.17'))
         eq(text.tag_nextrange('STRING', '8.17'), ('8.19', '8.26'))
         eq(text.tag_nextrange('SYNC', '8.0'), ('8.26', '9.0'))
-        eq(text.tag_nextrange('SYNC', '31.0'), ('31.10', '33.0'))
+        eq(text.tag_nextrange('SYNC', '31.0'), ('31.10', '32.0'))
+        eq(text.tag_nextrange('SYNC', '32.0'), ('33.7', '34.0'))
+        eq(text.tag_nextrange('SYNC', '34.0'), ('35.10', '36.0'))
+        eq(text.tag_nextrange('SYNC', '36.0'), ('37.13', '39.0'))
+        eq(text.tag_nextrange('SYNC', '39.0'), ())
 
     def _assert_highlighting(self, source, tag_ranges):
         """Check highlighting of a given piece of code.