bpo-33204: IDLE: consistently color invalid string prefixes (GH-6344)
A 'u' string prefix cannot be paired with either 'r' or 'f'. Consistently
color as much of the prefix, starting at the right, as is valid.
(cherry picked from commit da58533ac6
)
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
This commit is contained in:
parent
ab84572321
commit
6130675efe
|
@ -21,7 +21,7 @@ def make_pat():
|
||||||
# 1st 'file' colorized normal, 2nd as builtin, 3rd as string
|
# 1st 'file' colorized normal, 2nd as builtin, 3rd as string
|
||||||
builtin = r"([^.'\"\\#]\b|^)" + any("BUILTIN", builtinlist) + r"\b"
|
builtin = r"([^.'\"\\#]\b|^)" + any("BUILTIN", builtinlist) + r"\b"
|
||||||
comment = any("COMMENT", [r"#[^\n]*"])
|
comment = any("COMMENT", [r"#[^\n]*"])
|
||||||
stringprefix = r"(?i:\br|u|f|fr|rf|b|br|rb)?"
|
stringprefix = r"(?i:r|u|f|fr|rf|b|br|rb)?"
|
||||||
sqstring = stringprefix + r"'[^'\\\n]*(\\.[^'\\\n]*)*'?"
|
sqstring = stringprefix + r"'[^'\\\n]*(\\.[^'\\\n]*)*'?"
|
||||||
dqstring = stringprefix + r'"[^"\\\n]*(\\.[^"\\\n]*)*"?'
|
dqstring = stringprefix + r'"[^"\\\n]*(\\.[^"\\\n]*)*"?'
|
||||||
sq3string = stringprefix + r"'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?"
|
sq3string = stringprefix + r"'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?"
|
||||||
|
@ -265,11 +265,14 @@ def _color_delegator(parent): # htest #
|
||||||
source = ("# Following has syntax errors\n"
|
source = ("# Following has syntax errors\n"
|
||||||
"if True: then int 1\nelif False: print 0\nelse: float(None)\n"
|
"if True: then int 1\nelif False: print 0\nelse: float(None)\n"
|
||||||
"if iF + If + IF: 'keywork matching must respect case'\n"
|
"if iF + If + IF: 'keywork matching must respect case'\n"
|
||||||
"# All valid prefixes for unicode and byte strings should be colored\n"
|
"# All valid prefixes for unicode and byte strings should be colored.\n"
|
||||||
"'x', '''x''', \"x\", \"\"\"x\"\"\"\n"
|
"'x', '''x''', \"x\", \"\"\"x\"\"\"\n"
|
||||||
"r'x', u'x', R'x', U'x', f'x', F'x', ur'is invalid'\n"
|
"r'x', u'x', R'x', U'x', f'x', F'x'\n"
|
||||||
"fr'x', Fr'x', fR'x', FR'x', rf'x', rF'x', Rf'x', RF'x'\n"
|
"fr'x', Fr'x', fR'x', FR'x', rf'x', rF'x', Rf'x', RF'x'\n"
|
||||||
"b'x',B'x', br'x',Br'x',bR'x',BR'x', rb'x'.rB'x',Rb'x',RB'x'\n")
|
"b'x',B'x', br'x',Br'x',bR'x',BR'x', rb'x'.rB'x',Rb'x',RB'x'\n"
|
||||||
|
"# Invalid combinations of legal characters should be half colored.\n"
|
||||||
|
"ur'x', ru'x', uf'x', fu'x', UR'x', ufr'x', rfu'x', xf'x', fx'x'"
|
||||||
|
)
|
||||||
text = Text(top, background="white")
|
text = Text(top, background="white")
|
||||||
text.pack(expand=1, fill="both")
|
text.pack(expand=1, fill="both")
|
||||||
text.insert("insert", source)
|
text.insert("insert", source)
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
IDLE: consistently color invalid string prefixes. A 'u' string prefix cannot
|
||||||
|
be paired with either 'r' or 'f'. Consistently color as much of the prefix,
|
||||||
|
starting at the right, as is valid.
|
Loading…
Reference in New Issue