Color all word instances of "as" after "import", & on the same line, as if

keywords.  Cheap approximation to the truth.

diff --git a/Tools/idle/ColorDelegator.py b/Tools/idle/ColorDelegator.py
index 77edfe85854091eead9219a4518910302166b37e..6722cfdb8120391acdad2c93db3e70bf534e0f07 100644 (file)
--- a/Tools/idle/ColorDelegator.py
+++ b/Tools/idle/ColorDelegator.py
@@ -28,6 +28,7 @@ def make_pat():
 
 prog = re.compile(make_pat(), re.S)
 idprog = re.compile(r"\s+(\w+)", re.S)
+asprog = re.compile(r".*?\b(as)\b", re.S)
 
 class ColorDelegator(Delegator):
 
@@ -35,6 +36,7 @@ class ColorDelegator(Delegator):
         Delegator.__init__(self)
         self.prog = prog
         self.idprog = idprog
+        self.asprog = asprog
 
     def setdelegate(self, delegate):
         if self.delegate is not None:
@@ -198,6 +200,17 @@ class ColorDelegator(Delegator):
                                     self.tag_add("DEFINITION",
                                                  head + "+%dc" % a,
                                                  head + "+%dc" % b)
+                            elif value == "import":
+                                # color all the "as" words on same line;
+                                # cheap approximation to the truth
+                                while 1:
+                                    m1 = self.asprog.match(chars, b)
+                                    if not m1:
+                                        break
+                                    a, b = m1.span(1)
+                                    self.tag_add("KEYWORD",
+                                                 head + "+%dc" % a,
+                                                 head + "+%dc" % b)
                     m = self.prog.search(chars, m.end())
                 if "SYNC" in self.tag_names(next + "-1c"):
                     head = next