--- a/eric6/QScintilla/EditorAssembly.py Tue Feb 09 08:34:39 2021 +0100
+++ b/eric6/QScintilla/EditorAssembly.py Tue Feb 09 11:39:58 2021 +0100
@@ -197,7 +197,7 @@
elif entryName in self.__module.modules:
entry = self.__module.modules[entryName]
# step 2.0: add module classes
- items = {}
+ items = []
for cl in entry.classes.values():
if cl.isPrivate():
icon = UI.PixmapCache.getIcon("class_private")
@@ -206,12 +206,11 @@
"class_protected")
else:
icon = UI.PixmapCache.getIcon("class")
- items[cl.name] = (icon, cl.lineno, cl.endlineno)
- for key in sorted(items.keys()):
- itm = items[key]
- self.__membersCombo.addItem(itm[0], key, itm[1])
+ items.append((icon, cl.name, cl.lineno, cl.endlineno))
+ for itm in sorted(items, key=lambda x: (x[1], x[2])):
+ self.__membersCombo.addItem(itm[0], itm[1], itm[2])
memberIndex += 1
- self.__membersBoundaries[(itm[1], itm[2])] = (
+ self.__membersBoundaries[(itm[2], itm[3])] = (
memberIndex
)
else:
@@ -257,7 +256,7 @@
items = []
icon = UI.PixmapCache.getIcon("attribute_class")
for globalVar in entry.globals.values():
- items.append((icon, globalVar.nameglobalVar.lineno))
+ items.append((icon, globalVar.name, globalVar.lineno))
for itm in sorted(items, key=lambda x: (x[1], x[2])):
self.__membersCombo.addItem(itm[0], itm[1], itm[2])
@@ -372,7 +371,7 @@
else:
icon = UI.PixmapCache.getIcon("attribute")
items.append(
- (icon, globalValue.nameglobalValue.lineno)
+ (icon, globalValue.name, globalValue.lineno)
)
for itm in sorted(items, key=lambda x: (x[1], x[2])):
self.__globalsCombo.addItem(itm[0], itm[1], itm[2])
