mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-08 10:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Reformat idlelib colorizer (GH-25479)

Browse source 
Also replace if-then and and-or with conditional expressions.

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
(cherry picked from commit 702a0885ba)

Co-authored-by: E-Paine <63801254+E-Paine@users.noreply.github.com>

Co-authored-by: E-Paine <63801254+E-Paine@users.noreply.github.com>
This commit is contained in:
Miss Islington (bot) 2021-04-22 20:32:33 -07:00 • committed by GitHub
parent 8db72cd342
commit 987b65e956
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Lib/idlelib/colorizer.py
View file

@ -8,15 +8,17 @@ from idlelib.delegator import Delegator
DEBUG = False DEBUG = False
def any(name, alternates): def any(name, alternates):
"Return a named group pattern matching list of alternates." "Return a named group pattern matching list of alternates."
return "(?P<%s>" % name + "|".join(alternates) + ")" return "(?P<%s>" % name + "|".join(alternates) + ")"
def make_pat(): def make_pat():
kw = r"\b" + any("KEYWORD", keyword.kwlist) + r"\b" kw = r"\b" + any("KEYWORD", keyword.kwlist) + r"\b"
builtinlist = [str(name) for name in dir(builtins) builtinlist = [str(name) for name in dir(builtins)
if not name.startswith('_') and \ if not name.startswith('_') and
name not in keyword.kwlist] name not in keyword.kwlist]
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:r|u|f|fr|rf|b|br|rb)?" stringprefix = r"(?i:r|u|f|fr|rf|b|br|rb)?"
@ -25,12 +27,14 @@ def make_pat():
sq3string = stringprefix + r"'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?" sq3string = stringprefix + r"'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?"
dq3string = stringprefix + r'"""[^"\\]*((\\.|"(?!""))[^"\\]*)*(""")?' dq3string = stringprefix + r'"""[^"\\]*((\\.|"(?!""))[^"\\]*)*(""")?'
string = any("STRING", [sq3string, dq3string, sqstring, dqstring]) string = any("STRING", [sq3string, dq3string, sqstring, dqstring])
return kw + "|" + builtin + "|" + comment + "|" + string +\ return (kw + "|" + builtin + "|" + comment + "|" + string +
"|" + any("SYNC", [r"\n"]) "|" + any("SYNC", [r"\n"]))
prog = re.compile(make_pat(), re.S) prog = re.compile(make_pat(), re.S)
idprog = re.compile(r"\s+(\w+)", re.S) idprog = re.compile(r"\s+(\w+)", re.S)
def color_config(text): def color_config(text):
"""Set color options of Text widget. """Set color options of Text widget.
@ -49,7 +53,7 @@ def color_config(text):
selectforeground=select_colors['foreground'], selectforeground=select_colors['foreground'],
selectbackground=select_colors['background'], selectbackground=select_colors['background'],
inactiveselectbackground=select_colors['background'], # new in 8.5 inactiveselectbackground=select_colors['background'], # new in 8.5
) )
class ColorDelegator(Delegator): class ColorDelegator(Delegator):
@ -120,14 +124,17 @@ class ColorDelegator(Delegator):
"BUILTIN": idleConf.GetHighlight(theme, "builtin"), "BUILTIN": idleConf.GetHighlight(theme, "builtin"),
"STRING": idleConf.GetHighlight(theme, "string"), "STRING": idleConf.GetHighlight(theme, "string"),
"DEFINITION": idleConf.GetHighlight(theme, "definition"), "DEFINITION": idleConf.GetHighlight(theme, "definition"),
"SYNC": {'background':None,'foreground':None}, "SYNC": {'background': None, 'foreground': None},
"TODO": {'background':None,'foreground':None}, "TODO": {'background': None, 'foreground': None},
"ERROR": idleConf.GetHighlight(theme, "error"), "ERROR": idleConf.GetHighlight(theme, "error"),
# The following is used by ReplaceDialog: # "hit" is used by ReplaceDialog to mark matches. It shouldn't be changed by Colorizer, but
# that currently isn't technically possible. This should be moved elsewhere in the future
# when fixing the "hit" tag's visibility, or when the replace dialog is replaced with a
# non-modal alternative.
"hit": idleConf.GetHighlight(theme, "hit"), "hit": idleConf.GetHighlight(theme, "hit"),
} }
if DEBUG: print('tagdefs',self.tagdefs) if DEBUG: print('tagdefs', self.tagdefs)
def insert(self, index, chars, tags=None): def insert(self, index, chars, tags=None):
"Insert chars into widget at index and mark for colorizing." "Insert chars into widget at index and mark for colorizing."
@ -184,8 +191,8 @@ class ColorDelegator(Delegator):
if self.allow_colorizing and not self.colorizing: if self.allow_colorizing and not self.colorizing:
self.after_id = self.after(1, self.recolorize) self.after_id = self.after(1, self.recolorize)
if DEBUG: if DEBUG:
print("auto colorizing turned",\ print("auto colorizing turned",
self.allow_colorizing and "on" or "off") "on" if self.allow_colorizing else "off")
return "break" return "break"
def recolorize(self): def recolorize(self):
@ -232,10 +239,7 @@ class ColorDelegator(Delegator):
head, tail = item head, tail = item
self.tag_remove("SYNC", head, tail) self.tag_remove("SYNC", head, tail)
item = self.tag_prevrange("SYNC", head) item = self.tag_prevrange("SYNC", head)
if item: head = item[1] if item else "1.0"
head = item[1]
else:
head = "1.0"
chars = "" chars = ""
next = head next = head
@ -307,7 +311,7 @@ def _color_delegator(parent): # htest #
"elif False: print(0)\n" "elif False: print(0)\n"
"else: float(None)\n" "else: float(None)\n"
"if iF + If + IF: 'keyword matching must respect case'\n" "if iF + If + IF: 'keyword matching must respect case'\n"
"if'': x or'' # valid string-keyword no-space combinations\n" "if'': x or'' # valid keyword-string no-space combinations\n"
"async def f(): await g()\n" "async def f(): await g()\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"