changed the "method find" algorithm so the function/class/method popup menu also works with space-indented source files -- jvr
diff --git a/Mac/Tools/IDE/PyEdit.py b/Mac/Tools/IDE/PyEdit.py
index 63a21e7..7983705 100644
--- a/Mac/Tools/IDE/PyEdit.py
+++ b/Mac/Tools/IDE/PyEdit.py
@@ -586,6 +586,9 @@
def getclasslist(self):
from string import find, strip
+ import re
+ methodRE = re.compile(r"\r[ \t]+def ")
+ findMethod = methodRE.search
editor = self.editgroup.editor
text = editor.get()
list = []
@@ -613,10 +616,12 @@
append((pos + 7, classtag))
pos = 0
while 1:
- pos = find(text, '\r\tdef ', pos + 1)
- if pos < 0:
+ m = findMethod(text, pos + 1)
+ if m is None:
break
- append((pos + 6, methodtag))
+ pos = m.regs[0][0]
+ #pos = find(text, '\r\tdef ', pos + 1)
+ append((m.regs[0][1], methodtag))
list.sort()
classlist = []
methodlistappend = None